topologicpy 0.8.8__py3-none-any.whl → 0.8.10__py3-none-any.whl

topologicpy/BVH.py

@@ -282,7 +282,7 @@ class BVH:
             # Add an edge from the parent to this vertex (if a parent exists)
             if parent_vertex is not None:
                 d = Vertex.Distance(parent_vertex, current_vertex)
-                if d < tolerance:
+                if d <= tolerance:
                     current_vertex = Topology.Translate(current_vertex, tolerance*random.uniform(2,50), tolerance*random.uniform(2,50), tolerance*random.uniform(2,50))
                 edge = Edge.ByVertices(parent_vertex, current_vertex, tolerance=tolerance)
                 graph = Graph.AddEdge(graph, edge, silent=True)

topologicpy/Cell.py

@@ -998,14 +998,14 @@ class Cell():
                 verticalFaces.append(aFace)
                 verticalApertures += getApertures(aFace)
             elif aCode == 1:
-                if abs(Vertex.Z(Topology.Centroid(aFace)) - zMin) < tolerance:
+                if abs(Vertex.Z(Topology.Centroid(aFace)) - zMin) <= tolerance:
                     bottomHorizontalFaces.append(aFace)
                     bottomHorizontalApertures += getApertures(aFace)
                 else:
                     topHorizontalFaces.append(aFace)
                     topHorizontalApertures += getApertures(aFace)
             elif aCode == 2:
-                if abs(Vertex.Z(Topology.Centroid(aFace)) - zMax) < tolerance:
+                if abs(Vertex.Z(Topology.Centroid(aFace)) - zMax) <= tolerance:
                     topHorizontalFaces.append(aFace)
                     topHorizontalApertures += getApertures(aFace)
                 else:
@@ -2352,6 +2352,128 @@ class Cell():
             volume = None
         return volume
 
+    @staticmethod
+    def Wedge(origin=None,
+            width=1,
+            length=1,
+            height=1,
+            flipHorizontal = False,
+            flipVertical = False,
+            direction=[0,0,1],
+            placement="center",
+            tolerance=0.0001,
+            silent=False):
+        """
+        Creates a Wedge.
+
+        Parameters
+        ----------
+        origin : topologic_core.Vertex , optional
+            The location of the origin of the Wedge. The default is None which results in the Wedge being placed at (0, 0, 0).
+        width : float , optional
+            The overall width of the Wedge. The default is 1.0.
+        length : float , optional
+            The overall length of the Wedge. The default is 1.0.
+        height : float , optional
+            The overall height of the Wedge. The default is 1.0.
+        direction : list , optional
+            The vector representing the up direction of the Wedge. The default is [0, 0, 1].
+        placement : str , optional
+            The description of the placement of the origin of the Wedge. This can be "center", "lowerleft", "upperleft", "lowerright", "upperright". It is case insensitive. The default is "center".
+        tolerance : float , optional
+            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.
+
+        Returns
+        -------
+        topologic_core.Cell
+            The created Wedge.
+
+        """
+        from topologicpy.Vertex import Vertex
+        from topologicpy.Face import Face
+        from topologicpy.Topology import Topology
+
+        if not isinstance(width, int) and not isinstance(width, float):
+            if not silent:
+                print("Cell.Wedge - Error: The width input parameter is not a valid number. Returning None.")
+            return None
+        if not isinstance(length, int) and not isinstance(length, float):
+            if not silent:
+                print("Cell.Wedge - Error: The length input parameter is not a valid number. Returning None.")
+            return None
+        if not isinstance(height, int) and not isinstance(height, float):
+            if not silent:
+                print("Cell.Wedge - Error: The height input parameter is not a valid number. Returning None.")
+            return None
+        if width <= tolerance:
+            if not silent:
+                print("Cell.Wedge - Error: The width input parameter must be a positive number greater than the tolerance input parameter. Returning None.")
+            return None
+        if length <= tolerance:
+            if not silent:
+                print("Cell.Wedge - Error: The length input parameter must be a positive number  greater than the tolerance input parameter. Returning None.")
+            return None
+        if height <= tolerance:
+            if not silent:
+                print("Cell.Wedge - Error: The a input parameter must be a positive number greater than the tolerance input parameter. Returning None.")
+            return None
+        if origin == None:
+            origin = Vertex.Origin()
+        if not Topology.IsInstance(origin, "vertex"):
+            if not silent:
+                print("Cell.Wedge - Error: The origin input parameter is not a valid topologic vertex. Returning None.")
+            return None
+        if not isinstance(direction, list):
+            if not silent:
+                print("Cell.Wedge - Error: The direction input parameter is not a valid list. Returning None.")
+            return None
+        if not len(direction) == 3:
+            if not silent:
+                print("Cell.Wedge - Error: The direction input parameter is not a valid vector. Returning None.")
+            return None
+        
+        # Define the vertices of the T-shape (counterclockwise)
+        v1 = Vertex.ByCoordinates(0,0,0)
+        v2 = Vertex.ByCoordinates(width, 0, 0)
+        v3 = Vertex.ByCoordinates(width, length, 0)
+        v4 = Vertex.ByCoordinates(0, length, 0)
+        v5 = Vertex.ByCoordinates(0, length, height)
+        v6 = Vertex.ByCoordinates(0, 0, height)
+
+        f1 = Face.ByVertices([v1, v2, v3, v4], tolerance=tolerance)
+        f2 = Face.ByVertices([v1, v2, v6], tolerance=tolerance)
+        f3 = Face.ByVertices([v4, v5, v3], tolerance=tolerance)
+        f4 = Face.ByVertices([v1, v6, v5, v4], tolerance=tolerance)
+        f5 = Face.ByVertices([v2, v3, v5, v6], tolerance=tolerance)
+        cell = Cell.ByFaces([f1, f2, f3, f4, f5])
+        cell = Topology.Translate(cell, -width/2, -length/2, -height/2)
+        cell = Topology.Translate(cell, Vertex.X(origin), Vertex.Y(origin), Vertex.Z(origin))
+        if flipHorizontal == True:
+            xScale = -1
+        else:
+            xScale = 1
+        if flipVertical == True:
+            zScale = -1
+        else:
+            zScale = 1
+        if xScale == -1 or zScale == -1:
+            cell = Topology.Scale(cell, origin=origin, x=xScale, y=1, z=zScale)
+        if placement.lower() == "lowerleft":
+            cell = Topology.Translate(cell, origin=origin, x=width/2, y=length/2, z=height/2)
+        elif placement.lower() == "upperright":
+            cell = Topology.Translate(cell, origin=origin, x=-width/2, y=-length/2, z=-height/2)
+        elif placement.lower() == "upperleft":
+            cell = Topology.Translate(cell, origin=origin, x=width/2, y=-length/2, z=-height/2)
+        elif placement.lower() == "lowerright":
+            cell = Topology.Translate(cell, origin=origin, x=-width/2, y=length/2, z=height/2)
+        
+        if direction != [0, 0, 1]:
+            cell = Topology.Orient(cell, origin=origin, dirA=[0, 0, 1], dirB=direction)
+        
+        return cell
+
     @staticmethod
     def Wires(cell) -> list:
         """

topologicpy/CellComplex.py

@@ -546,7 +546,7 @@ class CellComplex():
                     internalVerticalApertures += getApertures(aFace)
             elif aCode == 1:
                 if n == 1:
-                    if abs(Vertex.Z(Topology.Centroid(aFace)) - zMin) < tolerance:
+                    if abs(Vertex.Z(Topology.Centroid(aFace)) - zMin) <= tolerance:
                         bottomHorizontalFaces.append(aFace)
                         bottomHorizontalApertures += getApertures(aFace)
                     else:
@@ -557,7 +557,7 @@ class CellComplex():
                     internalHorizontalApertures += getApertures(aFace)
             elif aCode == 2:
                 if n == 1:
-                    if abs(Vertex.Z(Topology.Centroid(aFace)) - zMax) < tolerance:
+                    if abs(Vertex.Z(Topology.Centroid(aFace)) - zMax) <= tolerance:
                         topHorizontalFaces.append(aFace)
                         topHorizontalApertures += getApertures(aFace)
                     else:

topologicpy/Edge.py

@@ -153,15 +153,15 @@ class Edge():
             
             shared_vertex = None
             
-            if Vertex.Distance(start1, start2) < tolerance:
+            if Vertex.Distance(start1, start2) <= tolerance:
                 shared_vertex = start1
-            elif Vertex.Distance(start1, end2) < tolerance:
+            elif Vertex.Distance(start1, end2) <= tolerance:
                 shared_vertex = start1
                 edge2 = Edge.Reverse(edge2)
-            elif Vertex.Distance(end1, start2) < tolerance:
+            elif Vertex.Distance(end1, start2) <= tolerance:
                 shared_vertex = start2
                 edge1 = Edge.Reverse(edge1)
-            elif Vertex.Distance(end1, end2) < tolerance:
+            elif Vertex.Distance(end1, end2) <= tolerance:
                 shared_vertex = end1
                 edge1 = Edge.Reverse(edge1)
                 edge2 = Edge.Reverse(edge2)
@@ -176,10 +176,10 @@ class Edge():
         if not Topology.IsInstance(edgeB, "Edge"):
             print("Edge.Bisect - Error: The input edgeB parameter is not a valid topologic edge. Returning None.")
             return None
-        if Edge.Length(edgeA) < tolerance:
+        if Edge.Length(edgeA) <= tolerance:
             print("Edge.Bisect - Error: The input edgeA parameter is shorter than the input tolerance parameter. Returning None.")
             return None
-        if Edge.Length(edgeB) < tolerance:
+        if Edge.Length(edgeB) <= tolerance:
             print("Edge.Bisect - Error: The input edgeB parameter is shorter than the input tolerance parameter. Returning None.")
             return None
         
@@ -313,7 +313,7 @@ class Edge():
             if not silent:
                 print("Edge.ByStartVertexEndVertex - Error: The input vertexA and vertexB parameters are the same vertex. Returning None.")
             return None
-        if Vertex.Distance(vertexA, vertexB) < tolerance:
+        if Vertex.Distance(vertexA, vertexB) <= tolerance:
             if not silent:
                 print("Edge.ByStartVertexEndVertex - Error: The distance between the input vertexA and vertexB parameters is less than the input tolerance. Returning None.")
             return None
@@ -360,7 +360,7 @@ class Edge():
                 print("Edge.ByVertexDirectionLength - Error: The input vertex parameter is not a valid vertex. Returning None.")
             return None
         
-        if length < tolerance:
+        if length <= tolerance:
             if not silent:
                 print("Edge.ByVertexDirectionLength - Error: The input edge parameter must not be less than the input tolerance parameter. Returning None.")
             return None
@@ -646,7 +646,7 @@ class Edge():
             print("Edge.Extend - Error: The input edge parameter is not a valid topologic edge. Returning None.")
             return None
         distance = abs(distance)
-        if distance < tolerance:
+        if distance <= tolerance:
             return edge
         sv = Edge.StartVertex(edge)
         ev = Edge.EndVertex(edge)
@@ -810,11 +810,11 @@ class Edge():
                 evb = Edge.EndVertex(edges[i])
                 dsvsv = Vertex.Distance(sva, svb)
                 devev = Vertex.Distance(eva, evb)
-                if dsvsv < tolerance and devev < tolerance:
+                if dsvsv <= tolerance and devev <= tolerance:
                     return i
                 dsvev = Vertex.Distance(sva, evb)
                 devsv = Vertex.Distance(eva, svb)
-                if dsvev < tolerance and devsv < tolerance:
+                if dsvev <= tolerance and devsv <= tolerance:
                     return i
         return None
 
@@ -856,7 +856,7 @@ class Edge():
             distances.append(Vertex.Distance(pair[0], pair[1]))
         v_list = Helper.Sort(v_list, distances)
         closest_pair = v_list[0]
-        if Vertex.Distance(closest_pair[0], closest_pair[1]) < tolerance:
+        if Vertex.Distance(closest_pair[0], closest_pair[1]) <= tolerance:
             return Topology.Centroid(Cluster.ByTopologies(closest_pair))
         
         if Edge.IsCollinear(edgeA, edgeB, tolerance=tolerance):
@@ -915,11 +915,11 @@ class Edge():
         if not Topology.IsInstance(edgeB, "Edge"):
             print("Edge.IsCollinear - Error: The input parameter edgeB is not a valid edge. Returning None")
             return None
-        if Edge.Length(edgeA) < tolerance:
-            print("Edge.IsCollinear - Error: The length of edgeA is less than the tolerance. Returning None")
+        if Edge.Length(edgeA) <= tolerance:
+            print("Edge.IsCollinear - Error: The length of edgeA is less than or equal the tolerance. Returning None")
             return None
-        if Edge.Length(edgeB) < tolerance:
-            print("Edge.IsCollinear - Error: The length of edgeB is less than the tolerance. Returning None")
+        if Edge.Length(edgeB) <= tolerance:
+            print("Edge.IsCollinear - Error: The length of edgeB is less than or equal to the tolerance. Returning None")
             return None
         
         # Get start and end points of the first edge
@@ -962,7 +962,7 @@ class Edge():
         distance_end = distance_from_line(end_b, start_a_coords, direction_a)
 
         # Check if both distances are within tolerance
-        return bool(distance_start < tolerance) and bool(distance_end < tolerance)
+        return bool(distance_start <= tolerance) and bool(distance_end <= tolerance)
     
     @staticmethod
     def IsCoplanar(edgeA, edgeB, mantissa: int = 6, tolerance: float = 0.0001):
@@ -996,11 +996,11 @@ class Edge():
         if not Topology.IsInstance(edgeB, "Edge"):
             print("Edge.IsCoplanar - Error: The input parameter edgeB is not a valid edge. Returning None")
             return None
-        if Edge.Length(edgeA) < tolerance:
-            print("Edge.IsCoplanar - Error: The length of edgeA is less than the tolerance. Returning None")
+        if Edge.Length(edgeA) <= tolerance:
+            print("Edge.IsCoplanar - Error: The length of edgeA is less than or equal to the tolerance. Returning None")
             return None
-        if Edge.Length(edgeB) < tolerance:
-            print("Edge.IsCoplanar - Error: The length of edgeB is less than the tolerance. Returning None")
+        if Edge.Length(edgeB) <= tolerance:
+            print("Edge.IsCoplanar - Error: The length of edgeB is less than or equal to the tolerance. Returning None")
             return None
         
         # Extract points
@@ -1513,8 +1513,8 @@ class Edge():
         distance = abs(distance)
         if distance == 0:
             return edge
-        if distance < tolerance:
-            print("Edge.Trim - Warning: The input distance parameter is less than the input tolerance parameter. Returning the input edge.")
+        if distance <= tolerance:
+            print("Edge.Trim - Warning: The input distance parameter is less than or equal to the input tolerance parameter. Returning the input edge.")
             return edge
         sv = Edge.StartVertex(edge)
         ev = Edge.EndVertex(edge)

topologicpy/Face.py

@@ -325,7 +325,7 @@ class Face():
                 print("Face.ByOffset - Warning: The input face parameter is not a valid face. Returning None.")
             return None
         
-        if abs(Face.Normal(face)[2] + 1) < tolerance:
+        if abs(Face.Normal(face)[2] + 1) <= tolerance:
             reverse = not(reverse)
         eb = Face.Wire(face)
         
@@ -494,7 +494,7 @@ class Face():
                 # We want this difference to be as close to 0 as possible
                 loss = (new_area - area) ** 2
                 # If the loss is less than the tolerance, accept the result and return a loss of 0.
-                if loss < tolerance:
+                if loss <= tolerance:
                     return 0
                 # Otherwise, return the actual loss value.
                 return loss 
@@ -1622,7 +1622,7 @@ class Face():
             dV = direction
         uV = Vector.Normalize(dV)
         dot = sum([i*j for (i, j) in zip(uV, faceNormal)])
-        if dot < tolerance:
+        if dot <= tolerance:
             return False
         return True
 
@@ -2278,7 +2278,7 @@ class Face():
         def vertex_part_of_face(vertex, face, tolerance=0.0001):
             vertices = Topology.Vertices(face)
             for v in vertices:
-                if Vertex.Distance(vertex, v) < tolerance:
+                if Vertex.Distance(vertex, v) <= tolerance:
                     return True
             return False
 
@@ -3040,9 +3040,9 @@ class Face():
             if not silent:
                 print("Face.NormalEdge - Error: The input face parameter is not a valid face. Retuning None.")
             return None
-        if length < tolerance:
+        if length <= tolerance:
             if not silent:
-                print("Face.NormalEdge - Error: The input length parameter is less than the input tolerance. Retuning None.")
+                print("Face.NormalEdge - Error: The input length parameter is less than or equal to the input tolerance. Retuning None.")
             return None
         iv = Face.InternalVertex(face)
         u, v = Face.VertexParameters(face, iv)

topologicpy/Graph.py

@@ -299,7 +299,7 @@ class Graph:
             unique = True
             returnVertex = vertex
             for gv in graph_vertices:
-                if (Vertex.Distance(vertex, gv) < tolerance):
+                if (Vertex.Distance(vertex, gv) <= tolerance):
                     if transferVertexDictionaries == True:
                         gd = Topology.Dictionary(gv)
                         vd = Topology.Dictionary(vertex)
@@ -7943,7 +7943,7 @@ class Graph:
         incoming_edges = []
         for edge in edges:
             ev = Edge.EndVertex(edge)
-            if Vertex.Distance(vertex, ev) < tolerance:
+            if Vertex.Distance(vertex, ev) <= tolerance:
                 incoming_edges.append(edge)
         return incoming_edges
     
@@ -8751,7 +8751,7 @@ class Graph:
         longest_path = Topology.SelfMerge(Cluster.ByTopologies(new_edges), tolerance=tolerance)
 
         sv = Topology.Vertices(longest_path)[0]
-        if Vertex.Distance(sv, vertexB) < tolerance: # Wire is reversed. Re-reverse it
+        if Vertex.Distance(sv, vertexB) <= tolerance: # Wire is reversed. Re-reverse it
             if Topology.IsInstance(longest_path, "Edge"):
                 longest_path = Edge.Reverse(longest_path)
             elif Topology.IsInstance(longest_path, "Wire"):
@@ -9048,7 +9048,7 @@ class Graph:
 
         def vertexInList(vertex, vertexList, tolerance=0.0001):
             for v in vertexList:
-                if Vertex.Distance(v, vertex) < tolerance:
+                if Vertex.Distance(v, vertex) <= tolerance:
                     return True
             return False
         
@@ -9382,7 +9382,7 @@ class Graph:
         outgoing_edges = []
         for edge in edges:
             sv = Edge.StartVertex(edge)
-            if Vertex.Distance(vertex, sv) < tolerance:
+            if Vertex.Distance(vertex, sv) <= tolerance:
                 outgoing_edges.append(edge)
         return outgoing_edges
     
@@ -9481,7 +9481,7 @@ class Graph:
                 new_scores[i] = alpha * incoming_score + (1 - alpha) / num_vertices
 
             # Check for convergence
-            if all(abs(new_scores[i] - scores[i]) < tolerance for i in range(len(vertices))):
+            if all(abs(new_scores[i] - scores[i]) <= tolerance for i in range(len(vertices))):
                 break
 
             scores = new_scores
@@ -9938,7 +9938,7 @@ class Graph:
                 if Topology.IsInstance(shortest_path, "Edge"):
                         shortest_path = Wire.ByEdges([shortest_path])
                 sv = Topology.Vertices(shortest_path)[0]
-                if Vertex.Distance(sv, gev) < tolerance: # Path is reversed. Correct it.
+                if Vertex.Distance(sv, gev) <= tolerance: # Path is reversed. Correct it.
                     if Topology.IsInstance(shortest_path, "Wire"):
                         shortest_path = Wire.Reverse(shortest_path)
                 shortest_path = Wire.OrientEdges(shortest_path, Wire.StartVertex(shortest_path), tolerance=tolerance)
@@ -10491,7 +10491,7 @@ class Graph:
                 if parent:
                     edge = Graph.Edge(graph, parent, vertex, tolerance=tolerance)
                     ev = Edge.EndVertex(edge)
-                    if Vertex.Distance(parent, ev) < tolerance:
+                    if Vertex.Distance(parent, ev) <= tolerance:
                         edge = Edge.Reverse(edge)
                     edges.append(edge)
             if parent == None:

topologicpy/Helper.py

@@ -35,6 +35,61 @@ except:
         warnings.warn("Helper - Error: Could not import numpy.")
 
 class Helper:
+    @staticmethod
+    def BinAndAverage(listA, mantissa: int = 6, tolerance: float = 0.0001, silent: bool = False):
+        """
+        Groups numbers within a specified tolerance into bins, calculates the average
+        of each bin, and returns a sorted list of these averages.
+
+        Parameters
+        ----------
+        listA : list
+            The input list.
+        mantissa : int , optional
+            The desired length of the mantissa. The default is 6
+        tolerance : float , optional
+            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.
+        
+        Returns
+        -------
+        list
+            The sorted list of bin averages.
+
+        """
+        if not isinstance(listA, list):
+            if not silent:
+                print("Helper.BinAndAverage = Error: The input listA parameter is not a valid list. Returning None.")
+            return None
+        
+        if len(listA) < 1:
+            if not silent:
+                print("Helper.BinAndAverage = Error: The input listA parameter is not an empty list. Returning None.")
+            return None
+        
+        if len(listA) == 1:
+            return listA
+            
+        # Sort numbers to facilitate grouping
+        listA = sorted(listA)
+        bins = []
+        current_bin = [listA[0]]
+
+        # Group numbers into bins based on tolerance
+        for num in listA[1:]:
+            if abs(num - current_bin[-1]) <= tolerance:
+                current_bin.append(num)
+            else:
+                bins.append(current_bin)
+                current_bin = [num]
+        bins.append(current_bin)  # Add the last bin
+
+        # Calculate averages of each bin
+        bin_averages = [round(sum(bin) / len(bin), mantissa) for bin in bins]
+
+        return sorted(bin_averages)
+    
     @staticmethod
     def ClosestMatch(item, listA):
         """

topologicpy/Polyskel.py

@@ -137,7 +137,7 @@ class Line2:
     def intersect(self, other):
         # Line intersection formula
         det = self.v.x * other.v.y - self.v.y * other.v.x
-        if abs(det) < EPSILON:
+        if abs(det) <= EPSILON:
             return None  # Lines are parallel
 
         dx = other.p.x - self.p.x
@@ -323,8 +323,8 @@ class _LAVertex:
 					# check eligibility of b
 					# a valid b should lie within the area limited by the edge and the bisectors of its two vertices:
 					xleft	= _cross(edge.bisector_left.v.normalized(), (b - edge.bisector_left.p).normalized()) > -EPSILON
-					xright	= _cross(edge.bisector_right.v.normalized(), (b - edge.bisector_right.p).normalized()) < EPSILON
-					xedge	= _cross(edge.edge.v.normalized(), (b - edge.edge.p).normalized()) < EPSILON
+					xright	= _cross(edge.bisector_right.v.normalized(), (b - edge.bisector_right.p).normalized()) <= EPSILON
+					xedge	= _cross(edge.edge.v.normalized(), (b - edge.edge.p).normalized()) <= EPSILON
 
 					if not (xleft and xright and xedge):
 						log.debug("\t\tDiscarded candidate %s (%s-%s-%s)", b, xleft, xright, xedge)

topologicpy/Shell.py

@@ -1247,7 +1247,7 @@ class Shell():
             return None
         if toAngle < fromAngle:
             toAngle += 360
-        if abs(toAngle-fromAngle) < tolerance:
+        if abs(toAngle-fromAngle) <= tolerance:
             return None
         fromAngle = math.radians(fromAngle)
         toAngle = math.radians(toAngle)
@@ -1258,14 +1258,14 @@ class Shell():
             temp = radiusA
             radiusA = radiusB
             radiusB = temp
-        if abs(radiusA - radiusB) < tolerance or radiusA < tolerance:
+        if abs(radiusA - radiusB) <= tolerance or radiusA <= tolerance:
             return None
         radiusRange = radiusA - radiusB
         sides = int(abs(math.floor(sides)))
         if sides < 3:
             return None
         rings = int(abs(rings))
-        if radiusB < tolerance:
+        if radiusB <= tolerance:
             radiusB = 0
         xOffset = 0
         yOffset = 0
@@ -1516,7 +1516,7 @@ class Shell():
         angle = abs(angle)
         if angle >= 90-tolerance:
             return None
-        if angle < tolerance:
+        if angle <= tolerance:
             return None
         origin = Topology.Centroid(face)
         normal = Face.Normal(face, mantissa=mantissa)

topologicpy/Topology.py

@@ -291,7 +291,7 @@ class Topology():
                     subTopology = subTopologies[i]
                     if exclusive == True and usedTopologies[i] == 1:
                         continue
-                    if Vertex.Distance(apCenter, subTopology) < tolerance:
+                    if Vertex.Distance(apCenter, subTopology) <= tolerance:
                         context = topologic.Context.ByTopologyParameters(subTopology, 0.5, 0.5, 0.5)
                         _ = Aperture.ByTopologyContext(aperture, context)
                         if exclusive == True:
@@ -1288,7 +1288,7 @@ class Topology():
         axes : str , optional
             Sets what axes are to be used for rotating the bounding box. This can be any permutation or substring of "xyz". It is not case sensitive. The default is "xyz".
         mantissa : int , optional
-            The desired length of the mantissa. The default is 6
+            The desired length of the mantissa. The default is 6.
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
         
@@ -1444,7 +1444,7 @@ class Topology():
 
         baseWire = Wire.ByVertices([vb1, vb2, vb3, vb4], close=True)
         baseFace = Face.ByWire(baseWire, tolerance=tolerance)
-        if abs(z_max - z_min) < tolerance:
+        if abs(z_max - z_min) <= tolerance:
             box = baseFace
         else:
             box = Cell.ByThickenedFace(baseFace, planarize=False, thickness=abs(z_max - z_min), bothSides=False)
@@ -6735,7 +6735,7 @@ class Topology():
         max_area = max(face_areas)
         max_faces = []
         for i, face_area in enumerate(face_areas):
-            if abs(max_area - face_area) < tolerance:
+            if abs(max_area - face_area) <= tolerance:
                 max_faces.append(faces[i])
         return max_faces
 
@@ -6784,7 +6784,7 @@ class Topology():
         max_length = max(edge_lengths)
         max_edges = []
         for i, edge_length in enumerate(edge_lengths):
-            if abs(max_length - edge_length) < tolerance:
+            if abs(max_length - edge_length) <= tolerance:
                 max_edges.append(edges[i])
         return max_edges
 
@@ -8349,7 +8349,7 @@ class Topology():
         min_length = min(edge_lengths)
         min_edges = []
         for i, edge_length in enumerate(edge_lengths):
-            if abs(min_length - edge_length) < tolerance:
+            if abs(min_length - edge_length) <= tolerance:
                 min_edges.append(edges[i])
         return min_edges
 
@@ -8816,7 +8816,7 @@ class Topology():
         min_area = min(face_areas)
         min_faces = []
         for i, face_area in enumerate(face_areas):
-            if abs(min_area - face_area) < tolerance:
+            if abs(min_area - face_area) <= tolerance:
                 min_faces.append(faces[i])
         return min_faces
 
@@ -9585,7 +9585,7 @@ class Topology():
                 for vertex in vertices:
                     for selector in selectors:
                         d = Vertex.Distance(selector, vertex)
-                        if d < tolerance:
+                        if d <= tolerance:
                             vertex = Topology.SetDictionary(vertex, Topology.Dictionary(selector), silent=True)
                             break
             if tranEdges == True:
@@ -9593,7 +9593,7 @@ class Topology():
                 for selector in selectors:
                     for edge in edges:
                         d = Vertex.Distance(selector, edge)
-                        if d < tolerance:
+                        if d <= tolerance:
 
                             edge = Topology.SetDictionary(edge, Topology.Dictionary(selector), silent=True)
                             break
@@ -9602,7 +9602,7 @@ class Topology():
                 for face in faces:
                     for selector in selectors:
                         d = Vertex.Distance(selector, face)
-                        if d < tolerance:
+                        if d <= tolerance:
                             face = Topology.SetDictionary(face, Topology.Dictionary(selector), silent=True)
                             break
             if tranCells == True:

topologicpy/Vector.py

@@ -345,11 +345,11 @@ class Vector(list):
             if not silent:
                 print("Vector.Coordinates - Error: The input vectorB parameter is not a valid vector. Returning Nonne.")
             return None
-        if abs(vectorA[0]) < tolerance and abs(vectorA[1]) < tolerance:
+        if abs(vectorA[0]) <= tolerance and abs(vectorA[1]) <= tolerance:
             if not silent:
                 print("Vector.CompassAngle - Error: The input vectorA parameter is vertical in the Z Axis. Returning Nonne.")
             return None
-        if abs(vectorB[0]) < tolerance and abs(vectorB[1]) < tolerance:
+        if abs(vectorB[0]) <= tolerance and abs(vectorB[1]) <= tolerance:
             if not silent:
                 print("Vector.CompassAngle - Error: The input vectorB parameter is vertical in the Z Axis. Returning Nonne.")
             return None
@@ -404,7 +404,7 @@ class Vector(list):
         x, y, z = vector
         
         # Handle the origin
-        if abs(x) < tolerance and abs(y) < tolerance and abs(z) < tolerance:
+        if abs(x) <= tolerance and abs(y) <= tolerance and abs(z) <= tolerance:
             return "Origin"
         
         # Normalize vector to prevent magnitude bias
@@ -412,9 +412,9 @@ class Vector(list):
         x, y, z = x / magnitude, y / magnitude, z / magnitude
         
         # Apply tolerance to components
-        x = 0 if abs(x) < tolerance else x
-        y = 0 if abs(y) < tolerance else y
-        z = 0 if abs(z) < tolerance else z
+        x = 0 if abs(x) <= tolerance else x
+        y = 0 if abs(y) <= tolerance else y
+        z = 0 if abs(z) <= tolerance else z
         
         # Compass-based direction in the XY-plane
         if x == 0 and y > 0:
@@ -553,18 +553,18 @@ class Vector(list):
             if not silent:
                 print("Vector.Cross - Error: The input vectorB parameter is not a valid vector. Returning None.")
             return None
-        if Vector.Magnitude(vector=vectorA, mantissa=mantissa) < tolerance:
+        if Vector.Magnitude(vector=vectorA, mantissa=mantissa) <= tolerance:
             if not silent:
                 print("Vector.Cross - Error: The magnitude of the input vectorA parameter is less than the input tolerance parameter. Returning None.")
             return None
-        if Vector.Magnitude(vector=vectorB, mantissa=mantissa) < tolerance:
+        if Vector.Magnitude(vector=vectorB, mantissa=mantissa) <= tolerance:
             if not silent:
                 print("Vector.Cross - Error: The magnitude of the input vectorB parameter is less than the input tolerance parameter. Returning None.")
             return None
         vecA = np.array(vectorA)
         vecB = np.array(vectorB)
         vecC = list(np.cross(vecA, vecB))
-        if Vector.Magnitude(vecC) < tolerance:
+        if Vector.Magnitude(vecC) <= tolerance:
             return [0, 0, 0]
         return [round(vecC[0], mantissa), round(vecC[1], mantissa), round(vecC[2], mantissa)]
 
@@ -600,11 +600,11 @@ class Vector(list):
             if not silent:
                 print("Vector.Dot - Error: The input vectorB parameter is not a valid vector. Returning None.")
             return None
-        if Vector.Magnitude(vector=vectorA, mantissa=mantissa) < tolerance:
+        if Vector.Magnitude(vector=vectorA, mantissa=mantissa) <= tolerance:
             if not silent:
                 print("Vector.Dot - Error: The magnitude of the input vectorA parameter is less than the input tolerance parameter. Returning None.")
             return None
-        if Vector.Magnitude(vector=vectorB, mantissa=mantissa) < tolerance:
+        if Vector.Magnitude(vector=vectorB, mantissa=mantissa) <= tolerance:
             if not silent:
                 print("Vector.Dot - Error: The magnitude of the input vectorB parameter is less than the input tolerance parameter. Returning None.")
             return None
@@ -763,7 +763,7 @@ class Vector(list):
             True if the input vectors are the same. False otherwise.
         
         """
-        return all(abs(a - b) < tolerance for a, b in zip(vectorA, vectorB))
+        return all(abs(a - b) <= tolerance for a, b in zip(vectorA, vectorB))
 
     @staticmethod
     def Length(vector, mantissa: int = 6):
@@ -825,7 +825,7 @@ class Vector(list):
             The created vector that multiplies the input vector by the input magnitude.
 
         """
-        if abs(magnitude) < tolerance:
+        if abs(magnitude) <= tolerance:
             return [0.0] * len(vector)
         scaled_vector = [component * (magnitude) for component in vector]
         return scaled_vector

topologicpy/Vertex.py

@@ -35,7 +35,7 @@ except:
 
 class Vertex():
     @staticmethod
-    def AlignCoordinates(vertex, xList=None, yList=None, zList=None, transferDictionary=False, mantissa=6, silent=False):
+    def AlignCoordinates(vertex, xList: list = None, yList: list = None, zList: list = None, xEpsilon: float = 0.0001, yEpsilon: float = 0.0001, zEpsilon: float = 0.0001, transferDictionary: bool = False, mantissa: int = 6, silent: bool = False):
         """
             Aligns the coordinates of the input vertex with the list of x,y, and z coordinates.
 
@@ -49,6 +49,12 @@ class Vertex():
                 The input numerical list of y-coordinates. The default is None.
             zList : list , optional
                 The input numerical list of z-coordinates. The default is None.
+            xEpsilon : float , optional
+                The desired tolerance for the x coordinates. The default is 0.0001.
+            yEpsilon : float , optional
+                The desired tolerance for the y coordinates. The default is 0.0001. 
+            zEpsilon : float , optional
+                The desired tolerance for the z coordinates. The default is 0.0001. 
             transferDictionary : bool , optional
                 if set to True, the dictionary of the input vertex is transferred to the new vertex.
             mantissa : int , optional
@@ -70,17 +76,24 @@ class Vertex():
                 print("Vertex.AlignCoordinates - Error: The input vertex parameter is not a topologic vertex. Returning None.")
             return None
         
-        closest_x, closest_y, closest_z = Vertex.Coordinates(vertex, mantissa=mantissa)
+        x, y, z = Vertex.Coordinates(vertex, mantissa=mantissa)
         if isinstance(xList, list):
             if len(xList) > 0:
-                closest_x = xList[Helper.ClosestMatch(closest_x, xList)]
+                closest_x = round(xList[Helper.ClosestMatch(x, xList)], mantissa)
         if isinstance(yList, list):
             if len(yList) > 0:
-                closest_y = yList[Helper.ClosestMatch(closest_y, yList)]
+                closest_y = round(yList[Helper.ClosestMatch(y, yList)], mantissa)
         if isinstance(zList, list):
             if len(zList) > 0:
-                closest_z = zList[Helper.ClosestMatch(closest_z, zList)]
-        return_vertex = Vertex.ByCoordinates(closest_x, closest_y, closest_z)
+                closest_z = round(zList[Helper.ClosestMatch(z, zList)], mantissa)
+        
+        if abs(x - closest_x) < xEpsilon:
+            x = closest_x
+        if abs(y - closest_y) < yEpsilon:
+            y = closest_y
+        if abs(z - closest_z) < zEpsilon:
+            z = closest_z
+        return_vertex = Vertex.ByCoordinates(x, y, z)
         if transferDictionary == True:
             return_vertex = Topology.SetDictionary(return_vertex, Topology.Dictionary(vertex), silent=silent)
         return return_vertex
@@ -788,7 +801,7 @@ class Vertex():
 
                     other_vertex = vertices[i]
                     distance = np.linalg.norm(np.array(vertex) - np.array(other_vertex))
-                    if distance < tolerance:
+                    if distance <= tolerance:
                         # Choose the coordinate with the least amount of decimal points
                         if count_decimal_points(other_vertex) < count_decimal_points(fused_vertex):
                             fused_vertex = other_vertex
@@ -857,7 +870,7 @@ class Vertex():
         incoming_edges = []
         for edge in edges:
             ev = Edge.EndVertex(edge)
-            if Vertex.Distance(vertex, ev) < tolerance:
+            if Vertex.Distance(vertex, ev) <= tolerance:
                 incoming_edges.append(edge)
         return incoming_edges
     
@@ -898,7 +911,7 @@ class Vertex():
                     return i
             else:
                 d = Vertex.Distance(vertex, vertices[i])
-                if d < tolerance:
+                if d <= tolerance:
                     return i
         return None
 
@@ -954,7 +967,7 @@ class Vertex():
 
             n_p = nearest_points[0]
             n_d = n_p[0]
-            if n_d < tolerance:
+            if n_d <= tolerance:
                 return n_p[1]
 
             # Calculate the weights for each nearest point based on inverse distance
@@ -1125,7 +1138,7 @@ class Vertex():
             return None
 
         if Topology.IsInstance(topology, "Vertex"):
-            return Vertex.Distance(vertex, topology) < tolerance
+            return Vertex.Distance(vertex, topology) <= tolerance
         elif Topology.IsInstance(topology, "Edge"):
             try:
                 parameter = Edge.ParameterAtVertex(topology, vertex)
@@ -1489,7 +1502,7 @@ class Vertex():
         outgoing_edges = []
         for edge in edges:
             sv = Edge.StartVertex(edge)
-            if Vertex.Distance(vertex, sv) < tolerance:
+            if Vertex.Distance(vertex, sv) <= tolerance:
                 outgoing_edges.append(edge)
         return outgoing_edges
     

topologicpy/Wire.py

@@ -51,7 +51,6 @@ class Wire():
 
         """
         from topologicpy.Vertex import Vertex
-        from topologicpy.Wire import Wire
         from topologicpy.Topology import Topology
         import numpy as np
 
@@ -183,7 +182,6 @@ class Wire():
 
         """
         from topologicpy.Edge import Edge
-        from topologicpy.Wire import Wire
         from topologicpy.Topology import Topology
 
         if not Topology.IsInstance(edge, "Edge"):
@@ -233,7 +231,6 @@ class Wire():
 
         """
         from topologicpy.Vertex import Vertex
-        from topologicpy.Wire import Wire
         from topologicpy.Face import Face
         from topologicpy.Topology import Topology
         from topologicpy.Dictionary import Dictionary
@@ -453,7 +450,6 @@ class Wire():
         from topologicpy.Edge import Edge
         from topologicpy.Face import Face
         from topologicpy.Dictionary import Dictionary
-        from topologicpy.Wire import Wire
         from topologicpy.Cluster import Cluster
         from topologicpy.Topology import Topology
         from topologicpy.Vector import Vector
@@ -724,7 +720,6 @@ class Wire():
             The created wire.
 
         """
-        from topologicpy.Wire import Wire
         from topologicpy.Face import Face
         from topologicpy.Topology import Topology
         from topologicpy.Dictionary import Dictionary
@@ -779,7 +774,7 @@ class Wire():
                 # We want this difference to be as close to 0 as possible
                 loss = (new_area - area) ** 2
                 # If the loss is less than the tolerance, accept the result and return a loss of 0.
-                if loss < tolerance:
+                if loss <= tolerance:
                     return 0
                 # Otherwise, return the actual loss value.
                 return loss 
@@ -965,10 +960,10 @@ class Wire():
             print("Wire.Circle - Error: The input placement parameter is not a recognized string. Returning None.")
             return None
         radius = abs(radius)
-        if radius < tolerance:
+        if radius <= tolerance:
             return None
         
-        if (abs(direction[0]) + abs(direction[1]) + abs(direction[2])) < tolerance:
+        if (abs(direction[0]) + abs(direction[1]) + abs(direction[2])) <= tolerance:
             return None
         baseV = []
         xList = []
@@ -976,7 +971,7 @@ class Wire():
 
         if toAngle < fromAngle:
             toAngle += 360
-        if abs(toAngle-fromAngle) < tolerance:
+        if abs(toAngle-fromAngle) <= tolerance:
             return None
         angleRange = toAngle - fromAngle
         fromAngle = math.radians(fromAngle)
@@ -1062,7 +1057,7 @@ class Wire():
                 if i1 == None or i2 == None:
                     print("Wire.Close - Error: Something went wrong. Returning None.")
                     return None
-                if d < tolerance:
+                if d <= tolerance:
                     g_vertices[i1] = Vertex.Coordinates(end)
                     g_vertices[i2] = Vertex.Coordinates(end)
                 else:
@@ -1472,7 +1467,6 @@ class Wire():
 
         """
         from topologicpy.Vertex import Vertex
-        from topologicpy.Wire import Wire
         from topologicpy.Topology import Topology
 
         if not isinstance(width, int) and not isinstance(width, float):
@@ -1595,7 +1589,7 @@ class Wire():
         else:
             yScale = 1
         if xScale == -1 or yScale == -1:
-            cross_shape = Topology.Scale(cross_shape, x=xScale, y=yScale, z=1)
+            cross_shape = Topology.Scale(cross_shape, origin=origin, x=xScale, y=yScale, z=1)
             if reverse == True:
                 cross_shape = Wire.Reverse(cross_shape)
         if placement.lower() == "lowerleft":
@@ -1657,7 +1651,6 @@ class Wire():
 
         """
         from topologicpy.Vertex import Vertex
-        from topologicpy.Wire import Wire
         from topologicpy.Topology import Topology
 
         if not isinstance(width, int) and not isinstance(width, float):
@@ -1745,7 +1738,7 @@ class Wire():
         else:
             yScale = 1
         if xScale == -1 or yScale == -1:
-            c_shape = Topology.Scale(c_shape, x=xScale, y=yScale, z=1)
+            c_shape = Topology.Scale(c_shape, origin=origin, x=xScale, y=yScale, z=1)
             if reverse == True:
                 c_shape = Wire.Reverse(c_shape)
         if placement.lower() == "lowerleft":
@@ -1787,7 +1780,7 @@ class Wire():
 
         def vIndex(v, vList, tolerance=0.0001):
             for i in range(len(vList)):
-                if Vertex.Distance(v, vList[i]) < tolerance:
+                if Vertex.Distance(v, vList[i]) <= tolerance:
                     return i+1
             return None
         
@@ -2087,7 +2080,7 @@ class Wire():
             return None
         if placement.lower() not in ["center", "lowerleft"]:
             return None
-        if (abs(direction[0]) + abs(direction[1]) + abs(direction[2])) < tolerance:
+        if (abs(direction[0]) + abs(direction[1]) + abs(direction[2])) <= tolerance:
             return None
         width = abs(width)
         length = abs(length)
@@ -2096,7 +2089,7 @@ class Wire():
         majorAxisLength=abs(majorAxisLength)
         minorAxisLength=abs(minorAxisLength)
         sides = abs(sides)
-        if width < tolerance or length < tolerance or focalLength < tolerance or eccentricity < tolerance or majorAxisLength < tolerance or minorAxisLength < tolerance or sides < 3:
+        if width <= tolerance or length <= tolerance or focalLength <= tolerance or eccentricity <= tolerance or majorAxisLength <= tolerance or minorAxisLength <= tolerance or sides < 3:
             return None
         if inputMode == 1:
             w = width
@@ -2134,7 +2127,7 @@ class Wire():
 
         if toAngle < fromAngle:
             toAngle += 360
-        if abs(toAngle - fromAngle) < tolerance:
+        if abs(toAngle - fromAngle) <= tolerance:
             return None
 
         angleRange = toAngle - fromAngle
@@ -2287,7 +2280,6 @@ class Wire():
         import math
         from topologicpy.Vertex import Vertex
         from topologicpy.Edge import Edge
-        from topologicpy.Wire import Wire
         from topologicpy.Face import Face
         from topologicpy.Topology import Topology
         from topologicpy.Vector import Vector
@@ -2318,7 +2310,7 @@ class Wire():
             if len(edges) == 2:
                 for edge in edges:
                     ev = Edge.EndVertex(edge)
-                    if Vertex.Distance(v, ev) < tolerance:
+                    if Vertex.Distance(v, ev) <= tolerance:
                         edge0 = edge
                     else:
                         edge1 = edge
@@ -2777,7 +2769,6 @@ class Wire():
 
         """
         from topologicpy.Vertex import Vertex
-        from topologicpy.Wire import Wire
         from topologicpy.Topology import Topology
 
         if not isinstance(width, int) and not isinstance(width, float):
@@ -2869,7 +2860,7 @@ class Wire():
         else:
             yScale = 1
         if xScale == -1 or yScale == -1:
-            i_shape = Topology.Scale(i_shape, x=xScale, y=yScale, z=1)
+            i_shape = Topology.Scale(i_shape, origin=origin, x=xScale, y=yScale, z=1)
             if reverse == True:
                 i_shape = Wire.Reverse(i_shape)
         if placement.lower() == "lowerleft":
@@ -3024,7 +3015,6 @@ class Wire():
 
         """
         from topologicpy.Vertex import Vertex
-        from topologicpy.Wire import Wire
         from topologicpy.Topology import Topology
 
         if not isinstance(width, int) and not isinstance(width, float):
@@ -3106,7 +3096,7 @@ class Wire():
         else:
             yScale = 1
         if xScale == -1 or yScale == -1:
-            l_shape = Topology.Scale(l_shape, x=xScale, y=yScale, z=1)
+            l_shape = Topology.Scale(l_shape, origin=origing, x=xScale, y=yScale, z=1)
             if reverse == True:
                 l_shape = Wire.Reverse(l_shape)
         if placement.lower() == "lowerleft":
@@ -3163,9 +3153,7 @@ class Wire():
         import math
         from topologicpy.Vertex import Vertex
         from topologicpy.Edge import Edge
-        from topologicpy.Wire import Wire
         from topologicpy.Face import Face
-        from topologicpy.Cluster import Cluster
         from topologicpy.Topology import Topology
         from topologicpy.Vector import Vector
         from topologicpy.Dictionary import Dictionary
@@ -3196,7 +3184,7 @@ class Wire():
             if len(edges) == 2:
                 for edge in edges:
                     ev = Edge.EndVertex(edge)
-                    if Vertex.Distance(v, ev) < tolerance:
+                    if Vertex.Distance(v, ev) <= tolerance:
                         edge0 = edge
                     else:
                         edge1 = edge
@@ -3390,10 +3378,10 @@ class Wire():
         while remaining_edges:
             next_edge = None
             for edge in remaining_edges:
-                if Vertex.Distance(Edge.StartVertex(edge), current_vertex) < tolerance:
+                if Vertex.Distance(Edge.StartVertex(edge), current_vertex) <= tolerance:
                     next_edge = edge
                     break
-                elif Vertex.Distance(Edge.EndVertex(edge), current_vertex) < tolerance:
+                elif Vertex.Distance(Edge.EndVertex(edge), current_vertex) <= tolerance:
                     next_edge = Edge.Reverse(edge)
                     break
 
@@ -3577,10 +3565,10 @@ class Wire():
             return None
         width = abs(width)
         length = abs(length)
-        if width < tolerance or length < tolerance:
+        if width <= tolerance or length <= tolerance:
             print("Wire.Rectangle - Error: One or more of the specified dimensions is below the tolerance value. Returning None.")
             return None
-        if (abs(direction[0]) + abs(direction[1]) + abs(direction[2])) < tolerance:
+        if (abs(direction[0]) + abs(direction[1]) + abs(direction[2])) <= tolerance:
             print("Wire.Rectangle - Error: The direction vector magnitude is below the tolerance value. Returning None.")
             return None
         xOffset = 0
@@ -3632,7 +3620,6 @@ class Wire():
         """
         from topologicpy.Vertex import Vertex
         from topologicpy.Edge import Edge
-        from topologicpy.Wire import Wire
         from topologicpy.Cluster import Cluster
         from topologicpy.Topology import Topology
 
@@ -3727,7 +3714,6 @@ class Wire():
         """
         from topologicpy.Vertex import Vertex
         from topologicpy.Edge import Edge
-        from topologicpy.Wire import Wire
         from topologicpy.Cluster import Cluster
         from topologicpy.Topology import Topology
         import inspect
@@ -4169,7 +4155,7 @@ class Wire():
             sorted_areas = sorted([(area, idx) for area, idx in areas[1:-1] if area is not None])
 
             # Remove points with area below the tolerance threshold
-            remove_indices = {idx for area, idx in sorted_areas if area < tolerance}
+            remove_indices = {idx for area, idx in sorted_areas if area <= tolerance}
 
             # Construct the simplified list of points
             simplified_points = [point for i, point in enumerate(points) if i not in remove_indices]
@@ -4336,7 +4322,7 @@ class Wire():
         if not placement.lower() in ["center", "lowerleft", "upperleft", "lowerright", "upperright"]:
             print("Wire.Spiral - Error: the input placement string is not one of center, lowerleft, upperleft, lowerright, or upperright. Returning None.")
             return None
-        if (abs(direction[0]) + abs(direction[1]) + abs(direction[2])) < tolerance:
+        if (abs(direction[0]) + abs(direction[1]) + abs(direction[2])) <= tolerance:
             print("Wire.Spiral - Error: the input direction vector is not a valid direction. Returning None.")
             return None
         
@@ -4537,7 +4523,6 @@ class Wire():
             return x*radius, y*radius
         
         from topologicpy.Vertex import Vertex
-        from topologicpy.Wire import Wire
         from topologicpy.Topology import Topology
         
         if not Topology.IsInstance(origin, "Vertex"):
@@ -4549,7 +4534,7 @@ class Wire():
             print("Wire.Squircle - Error: The input placement parameter is not a recognized string. Returning None.")
             return None
         radius = abs(radius)
-        if radius < tolerance:
+        if radius <= tolerance:
             return None
         
         if a <= 0:
@@ -4617,7 +4602,7 @@ class Wire():
             return None
         radiusA = abs(radiusA)
         radiusB = abs(radiusB)
-        if radiusA < tolerance or radiusB < tolerance:
+        if radiusA <= tolerance or radiusB <= tolerance:
             return None
         rays = abs(rays)
         if rays < 3:
@@ -4756,7 +4741,7 @@ class Wire():
         widthA = abs(widthA)
         widthB = abs(widthB)
         length = abs(length)
-        if widthA < tolerance or widthB < tolerance or length < tolerance:
+        if widthA <= tolerance or widthB <= tolerance or length <= tolerance:
             return None
         if not placement.lower() in ["center", "lowerleft", "upperleft", "lowerright", "upperright"]:
             return None
@@ -4788,7 +4773,6 @@ class Wire():
             baseWire = Topology.Orient(baseWire, origin=origin, dirA=[0, 0, 1], dirB=direction)
         return baseWire
 
-
     @staticmethod
     def TShape(origin=None,
             width=1,
@@ -4832,7 +4816,6 @@ class Wire():
 
         """
         from topologicpy.Vertex import Vertex
-        from topologicpy.Wire import Wire
         from topologicpy.Topology import Topology
 
         if not isinstance(width, int) and not isinstance(width, float):
@@ -4916,7 +4899,7 @@ class Wire():
         else:
             yScale = 1
         if xScale == -1 or yScale == -1:
-            t_shape = Topology.Scale(t_shape, x=xScale, y=yScale, z=1)
+            t_shape = Topology.Scale(t_shape, origin=origin, x=xScale, y=yScale, z=1)
             if reverse == True:
                 t_shape = Wire.Reverse(t_shape)
         if placement.lower() == "lowerleft":
@@ -4967,7 +4950,7 @@ class Wire():
             print("Wire.VertexDistance - Error: The input vertex parameter is not a valid topologic vertex. Returning None.")
             return None
         wire_length = Wire.Length(wire)
-        if wire_length < tolerance:
+        if wire_length <= tolerance:
             print("Wire.VertexDistance: The input wire parameter is a degenerate topologic wire. Returning None.")
             return None
         if not Topology.IsInstance(origin, "Vertex"):
@@ -5047,12 +5030,12 @@ class Wire():
             print("Wire.VertexByDistance - Error: The input wire parameter is not a valid topologic wire. Returning None.")
             return None
         wire_length = Wire.Length(wire)
-        if wire_length < tolerance:
+        if wire_length <= tolerance:
             print("Wire.VertexByDistance: The input wire parameter is a degenerate topologic wire. Returning None.")
             return None
-        if abs(distance) < tolerance:
+        if abs(distance) <= tolerance:
             return Wire.StartVertex(wire)
-        if abs(distance - wire_length) < tolerance:
+        if abs(distance - wire_length) <= tolerance:
             return Wire.EndVertex(wire)
         if not Wire.IsManifold(wire):
             print("Wire.VertexAtParameter - Error: The input wire parameter is non-manifold. Returning None.")
@@ -5065,9 +5048,9 @@ class Wire():
         if not Vertex.IsInternal(origin, wire, tolerance=tolerance):
             print("Wire.VertexByDistance - Error: The input origin parameter is not internal to the input wire parameter. Returning None.")
             return None
-        if Vertex.Distance(Wire.StartVertex(wire), origin) < tolerance:
+        if Vertex.Distance(Wire.StartVertex(wire), origin) <= tolerance:
             u = distance/wire_length
-        elif Vertex.Distance(Wire.EndVertex(wire), origin) < tolerance:
+        elif Vertex.Distance(Wire.EndVertex(wire), origin) <= tolerance:
             u = 1 - distance/wire_length
         else:
             d = Wire.VertexDistance(wire, origin) + distance

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.8.8'
+__version__ = '0.8.10'

{topologicpy-0.8.8.dist-info → topologicpy-0.8.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: topologicpy
-Version: 0.8.8
+Version: 0.8.10
 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.10.dist-info/RECORD

@@ -0,0 +1,36 @@
+topologicpy/ANN.py,sha256=m_WxD1lgQqDhUpaM20Lia6TmJACDYaAE96wigsi-99U,47932
+topologicpy/Aperture.py,sha256=p9pUzTQSBWoUaDiug1V1R1hnEIEwYSXFg2t7iRAmNRY,2723
+topologicpy/BVH.py,sha256=1q2lR5eDs7Wnwv7M-Kr7Cj3GG_iy7d1ddaZqWGHdX-w,12932
+topologicpy/Cell.py,sha256=Wwr2RsNEagfdt4Uz0GYosRTgNQj0pc5NOlzEWbL7cjQ,114343
+topologicpy/CellComplex.py,sha256=23bO0RYFIg6MOyt3PMFayaK523Alt8aHhc6UyJO02X0,51610
+topologicpy/Cluster.py,sha256=o5jdMRpcGfSGGiXQdFg-e9XcnBF5AqTj3xb1nSpwJWE,58606
+topologicpy/Color.py,sha256=q9xsGmxFMz7sQKmygwSVS12GaTRB-OT0-_i6t3-cthE,20307
+topologicpy/Context.py,sha256=ppApYKngZZCQBFWaxIMi2z2dokY23c935IDCBosxDAE,3055
+topologicpy/DGL.py,sha256=M_znFtyPBJJz-iXLYZs2wwBj24fhevIo739dGha0chM,139041
+topologicpy/Dictionary.py,sha256=t0O7Du-iPq46FyKqZfcjHfsUK1E8GS_e67R2V5cpkbw,33186
+topologicpy/Edge.py,sha256=yxkCVDYBflJNEYxnjMmlyvbkpg8TNy7y5bSH3yQ4jzs,71418
+topologicpy/EnergyModel.py,sha256=UoQ9Jm-hYsN383CbcLKw-y6BKitRHj0uyh84yQ-8ACg,53856
+topologicpy/Face.py,sha256=a6rPTdgf4yhoH29kwV_48U_XYtdvNWdHnkErmMBp2CU,180759
+topologicpy/Graph.py,sha256=6pRgWtkq9a5p7uXiPq2O4yMEJZG6H7A5wA44bjGOP3s,497470
+topologicpy/Grid.py,sha256=2s9cSlWldivn1i9EUz4OOokJyANveqmRe_vR93CAndI,18245
+topologicpy/Helper.py,sha256=4H5KPiv_eiEs489UOOyGLe9RaeoZIfmMh3mk_YCHmXg,29100
+topologicpy/Honeybee.py,sha256=Y_El6M8x3ixvvIe_VcRiwj_4C89ZZg5_WlT7adbCkpw,21849
+topologicpy/Matrix.py,sha256=ydw0EH4rZcGBFeLmBHPIyuk57DVKKL3M1GcArkFsYxM,10941
+topologicpy/Neo4j.py,sha256=BKOF29fRgXmdpMGkrNzuYbyqgCJ6ElPPMYlfTxXiVbc,22392
+topologicpy/Plotly.py,sha256=xfd_c2Mcam5KP-gDD-esl42RVXW5TSJsUCCqhUg1VFk,115788
+topologicpy/Polyskel.py,sha256=DDUayC29LI1EkxdK09F0DgGyH-NCOU1LE3J2Imz0rEI,19832
+topologicpy/PyG.py,sha256=LU9LCCzjxGPUM31qbaJXZsTvniTtgugxJY7y612t4A4,109757
+topologicpy/Shell.py,sha256=--dJoSdz6BapxVEyG2DI0W5apO_xwLORj5qmR15yl2Y,87983
+topologicpy/Speckle.py,sha256=AlsGlSDuKRtX5jhVsPNSSjjbZis079HbUchDH_5RJmE,18187
+topologicpy/Sun.py,sha256=42tDWMYpwRG7Z2Qjtp94eRgBuqySq7k8TgNUZDK7QxQ,36837
+topologicpy/Topology.py,sha256=zFNNxiXRsDURF4FABfU3aG0mEp-qYYmxjADksYXRIgI,463941
+topologicpy/Vector.py,sha256=rwMKNJQs7SsWc7bhGuxHAjkJA8s0w46xnY0Xo2zOPR0,39590
+topologicpy/Vertex.py,sha256=70bee44uuf1d-uk3kL_pKPJKduJLdjve14mmLpcaT3s,78511
+topologicpy/Wire.py,sha256=CYd8M774E6Pv9vDIrOoKWV6nKo2tNOi3xREQL9WE808,233433
+topologicpy/__init__.py,sha256=vlPCanUbxe5NifC4pHcnhSzkmmYcs_UrZrTlVMsxcFs,928
+topologicpy/version.py,sha256=xfh7QQ1d8queik59T_oYOabvDZyIi-O8o2ByZ-QACcQ,23
+topologicpy-0.8.10.dist-info/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
+topologicpy-0.8.10.dist-info/METADATA,sha256=MDU41HIFzabAK1nEmY8rsdZDpwG3vwgBi7PMc9Tzp_Y,10513
+topologicpy-0.8.10.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+topologicpy-0.8.10.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.8.10.dist-info/RECORD,,

topologicpy-0.8.8.dist-info/RECORD

@@ -1,36 +0,0 @@
-topologicpy/ANN.py,sha256=m_WxD1lgQqDhUpaM20Lia6TmJACDYaAE96wigsi-99U,47932
-topologicpy/Aperture.py,sha256=p9pUzTQSBWoUaDiug1V1R1hnEIEwYSXFg2t7iRAmNRY,2723
-topologicpy/BVH.py,sha256=mKVCAu9K8qzcWXtPDVH5usXZV1DNNNJl4n3rU5Lh1ZM,12931
-topologicpy/Cell.py,sha256=o5CxsBXxtnV439I4f8VMUoDMVwO5o3q0lHinHHMSmFg,108571
-topologicpy/CellComplex.py,sha256=-s8RKGa2H1eqLO7g6qyQvvuFMFJ0aIgXvIr9kOVgpjA,51608
-topologicpy/Cluster.py,sha256=o5jdMRpcGfSGGiXQdFg-e9XcnBF5AqTj3xb1nSpwJWE,58606
-topologicpy/Color.py,sha256=q9xsGmxFMz7sQKmygwSVS12GaTRB-OT0-_i6t3-cthE,20307
-topologicpy/Context.py,sha256=ppApYKngZZCQBFWaxIMi2z2dokY23c935IDCBosxDAE,3055
-topologicpy/DGL.py,sha256=M_znFtyPBJJz-iXLYZs2wwBj24fhevIo739dGha0chM,139041
-topologicpy/Dictionary.py,sha256=t0O7Du-iPq46FyKqZfcjHfsUK1E8GS_e67R2V5cpkbw,33186
-topologicpy/Edge.py,sha256=lWwJdQkAhiH5POB7TN6HSLv03g2jXHzBU7e2fE3eAno,71340
-topologicpy/EnergyModel.py,sha256=UoQ9Jm-hYsN383CbcLKw-y6BKitRHj0uyh84yQ-8ACg,53856
-topologicpy/Face.py,sha256=D1g4O5i5QMPZvIoX06Z-FsyNsYBDkCiHWJp00uqnr5o,180742
-topologicpy/Graph.py,sha256=yjD778MyWFLmUEryGFEzFZOJmnrZwkqrVYvpmH76Oxs,497462
-topologicpy/Grid.py,sha256=2s9cSlWldivn1i9EUz4OOokJyANveqmRe_vR93CAndI,18245
-topologicpy/Helper.py,sha256=DAAE_Ie_ekeMnCvcW08xXRwSAGCkjrS4lbz-o3ELuY4,27172
-topologicpy/Honeybee.py,sha256=Y_El6M8x3ixvvIe_VcRiwj_4C89ZZg5_WlT7adbCkpw,21849
-topologicpy/Matrix.py,sha256=ydw0EH4rZcGBFeLmBHPIyuk57DVKKL3M1GcArkFsYxM,10941
-topologicpy/Neo4j.py,sha256=BKOF29fRgXmdpMGkrNzuYbyqgCJ6ElPPMYlfTxXiVbc,22392
-topologicpy/Plotly.py,sha256=xfd_c2Mcam5KP-gDD-esl42RVXW5TSJsUCCqhUg1VFk,115788
-topologicpy/Polyskel.py,sha256=EFsuh2EwQJGPLiFUjvtXmAwdX-A4r_DxP5hF7Qd3PaU,19829
-topologicpy/PyG.py,sha256=LU9LCCzjxGPUM31qbaJXZsTvniTtgugxJY7y612t4A4,109757
-topologicpy/Shell.py,sha256=fLRnQ79vtdBDRW1Xn8Gaap34XheGbw7UBFd-ALJ2Y1g,87978
-topologicpy/Speckle.py,sha256=AlsGlSDuKRtX5jhVsPNSSjjbZis079HbUchDH_5RJmE,18187
-topologicpy/Sun.py,sha256=42tDWMYpwRG7Z2Qjtp94eRgBuqySq7k8TgNUZDK7QxQ,36837
-topologicpy/Topology.py,sha256=qw64d3Ct6u7W8Fy_-JIg3_xsyOzDIQ1hdnpxF2p_wH4,463931
-topologicpy/Vector.py,sha256=3gW0Y7mTcpc6ctjSfRWQXGKjIyHASKrMyIyPDT0kO2E,39573
-topologicpy/Vertex.py,sha256=tv6C-rbuNgXHDGgVLT5fbalynLdXqlUuiCDKtkeQ0vk,77814
-topologicpy/Wire.py,sha256=Gl3Jpygwp8775SG57ua5r5ffTHcN4FOAkeI87yP1cok,234001
-topologicpy/__init__.py,sha256=vlPCanUbxe5NifC4pHcnhSzkmmYcs_UrZrTlVMsxcFs,928
-topologicpy/version.py,sha256=ysM7ZSdOuCpaNFiqoGIRai1zq8iwLDlTTCvJsGJ1_eA,22
-topologicpy-0.8.8.dist-info/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
-topologicpy-0.8.8.dist-info/METADATA,sha256=h8t8ZxpBukHW7YQu9muct8f09ZIkb_tZFhP_IPWtc4c,10512
-topologicpy-0.8.8.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-topologicpy-0.8.8.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.8.8.dist-info/RECORD,,