topologicpy 0.4.96__tar.gz → 0.4.98__tar.gz

{topologicpy-0.4.96/src/topologicpy.egg-info → topologicpy-0.4.98}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.4.96
+Version: 0.4.98
 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.96 → topologicpy-0.4.98}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=61"]
 build-backend = "setuptools.build_meta"
 [project]
 name = "topologicpy"
-version = "0.4.96"
+version = "0.4.98"
 authors = [
   { name="Wassim Jabi", email="wassim.jabi@gmail.com" },
 ]

{topologicpy-0.4.96 → topologicpy-0.4.98}/src/topologicpy/Cell.py

@@ -1091,6 +1091,90 @@ class Cell(Topology):
         _ = cell.Edges(None, edges)
         return edges
 
+    @staticmethod
+    def Egg(origin: topologic.Vertex = None, height: float = 1.0, uSides: int = 16, vSides: int = 8, direction: list = [0,0,1],
+                   placement: str = "center", tolerance: float = 0.0001) -> topologic.Cell:
+        """
+        Creates a sphere.
+
+        Parameters
+        ----------
+        origin : topologic.Vertex , optional
+            The origin location of the sphere. The default is None which results in the sphere being placed at (0,0,0).
+        radius : float , optional
+            The radius of the sphere. The default is 0.5.
+        uSides : int , optional
+            The number of sides along the longitude of the sphere. The default is 16.
+        vSides : int , optional
+            The number of sides along the latitude of the sphere. The default is 8.
+        direction : list , optional
+            The vector representing the up direction of the sphere. The default is [0,0,1].
+        placement : str , optional
+            The description of the placement of the origin of the sphere. This can be "bottom", "center", or "lowerleft". It is case insensitive. The default is "center".
+        tolerance : float , optional
+            The desired tolerance. The default is 0.0001.
+
+        Returns
+        -------
+        topologic.Cell
+            The created sphere.
+
+        """
+
+        from topologicpy.Vertex import Vertex
+        from topologicpy.Topology import Topology
+        from topologicpy.Dictionary import Dictionary
+
+        if not origin:
+            origin = Vertex.ByCoordinates(0,0,0)
+        if not isinstance(origin, topologic.Vertex):
+            print("Cell.Sphere - Error: The input origin parameter is not a valid topologic vertex. Returning None.")
+            return None
+        
+        coords = [[0.0, 0.0, -0.5],
+                 [0.074748, 0.0, -0.494015],
+                 [0.140819, 0.0, -0.473222],
+                 [0.204118, 0.0, -0.438358],
+                 [0.259512, 0.0, -0.391913],
+                 [0.304837, 0.0, -0.335519],
+                 [0.338649, 0.0, -0.271416],
+                 [0.361307, 0.0, -0.202039],
+                 [0.375678, 0.0, -0.129109],
+                 [0.381294, 0.0, -0.053696],
+                 [0.377694, 0.0, 0.019874],
+                 [0.365135, 0.0, 0.091978],
+                 [0.341482, 0.0, 0.173973],
+                 [0.300154, 0.0, 0.276001],
+                 [0.252928, 0.0, 0.355989],
+                 [0.206605, 0.0, 0.405813],
+                 [0.157529, 0.0, 0.442299],
+                 [0.10604, 0.0, 0.472092],
+                 [0.05547, 0.0, 0.491784],
+                 [0.0, 0.0, 0.5]]
+        verts = [Vertex.ByCoordinates(coord) for coord in coords]
+        c = Wire.ByVertices(verts, close=False)
+        new_verts = []
+        for i in range(vSides+1):
+            new_verts.append(Wire.VertexByParameter(c, i/vSides))
+        c = Wire.ByVertices(new_verts, close=False)
+        egg = Topology.Spin(c, origin=Vertex.Origin(), triangulate=False, direction=[0,0,1], degree=360, sides=uSides, tolerance=tolerance)
+        if egg.Type() == topologic.CellComplex.Type():
+            egg = egg.ExternalBoundary()
+        if egg.Type() == topologic.Shell.Type():
+            egg = topologic.Cell.ByShell(egg)
+        egg = Topology.Scale(egg, origin=Vertex.Origin(), x=height, y=height, z=height)
+        if placement.lower() == "bottom":
+            egg = Topology.Translate(egg, 0, 0, height/2)
+        elif placement.lower() == "lowerleft":
+            bb = Cell.BoundingBox(egg)
+            d = Topology.Dictionary(bb)
+            width = Dictionary.ValueAtKey(d, 'width')
+            length = Dictionary.ValueAtKey(d, 'length')
+            egg = Topology.Translate(egg, width*0.5, length*0.5, height*0.5)
+        egg = Topology.Orient(egg, origin=Vertex.Origin(), dirA=[0,0,1], dirB=direction)
+        egg = Topology.Place(egg, originA=Vertex.Origin(), originB=origin)
+        return egg
+    
     @staticmethod
     def ExternalBoundary(cell: topologic.Cell) -> topologic.Shell:
         """

{topologicpy-0.4.96 → topologicpy-0.4.98}/src/topologicpy/Cluster.py

@@ -188,8 +188,11 @@ class Cluster(Topology):
                 if len(keys) > 0:
                     dictionaries.append(d)
         if len(dictionaries) > 0:
-            d = Dictionary.ByMergedDictionaries(dictionaries)
-            cluster = Topology.SetDictionary(cluster, d)
+            if len(dictionaries) > 1:
+                d = Dictionary.ByMergedDictionaries(dictionaries)
+            else:
+                d = dictionaries[0]
+                cluster = Topology.SetDictionary(cluster, d)
         return cluster
 
     @staticmethod

{topologicpy-0.4.96 → topologicpy-0.4.98}/src/topologicpy/Graph.py

@@ -675,7 +675,7 @@ class Graph:
         import  random
 
         if not isinstance(adjacencyMatrix, list):
-            print("Graph.BYAdjacencyMatrix - Error: The input adjacencyMatrix parameter is not a valid list. Returning None.")
+            print("Graph.ByAdjacencyMatrix - Error: The input adjacencyMatrix parameter is not a valid list. Returning None.")
             return None
         # Add vertices with random coordinates
         vertices = []
@@ -692,7 +692,7 @@ class Graph:
 
         # Create the graph using vertices and edges
         if len(vertices) == 0:
-            print("Graph.BYAdjacencyMatrix - Error: The graph does not contain any vertices. Returning None.")
+            print("Graph.ByAdjacencyMatrix - Error: The graph does not contain any vertices. Returning None.")
             return None
         
         return Graph.ByVerticesEdges(vertices, edges)
@@ -960,13 +960,9 @@ class Graph:
         graphs = []
         for i, vertices, in enumerate(vertices_ds):
             edges = edges_ds[i]
-            print("2. Length of Vertices:", len(vertices))
-            print("2. Length of Edges:", len(edges))
             g = Graph.ByVerticesEdges(vertices, edges)
             temp_v = Graph.Vertices(g)
             temp_e = Graph.Edges(g)
-            print("3. Length of Vertices:", len(temp_v))
-            print("3. Length of Edges:", len(temp_e))
             if isinstance(g, topologic.Graph):
                 if len(graphFeaturesKeys) == 0:
                     values = [graph_ids[i], graph_labels[i], graph_features[i]]
@@ -3154,10 +3150,8 @@ class Graph:
         # If the maximum number of colors are not provided, compute it using the graph's chromatic number.
         if maxColors == None:
             maxColors = Graph.ChromaticNumber(temp_graph)
-        print("MaxColors:", maxColors)
         colors = [0] * len(vertices)
         colors = graph_coloring(adj_mat, maxColors, colors)
-        print("Colors:", colors)
         for i, v in enumerate(vertices):
                 d = Topology.Dictionary(v)
                 d = Dictionary.SetValueAtKey(d, newKey, colors[i])
@@ -3314,7 +3308,7 @@ class Graph:
                 else:
                     returnList.append((n-1)/top_dist)
         except:
-            print("Could not use tqdm")
+            print("Graph.ClosenessCentrality - Warning: Could not use tqdm.")
             for va in vertices:
                 top_dist = 0
                 for vb in graphVertices:
@@ -3889,7 +3883,6 @@ class Graph:
             if not nodeMaskKey == None:
                 if not nd == None:
                     keys = Dictionary.Keys(nd)
-                    print("keys", keys)
                 else:
                     keys = []
                     flag = True
@@ -4791,8 +4784,6 @@ class Graph:
                     
 
             # Calculate the global clustering coefficient
-            print("Total Triangles:", total_triangles )
-            print("Total Possible Triangles:", total_possible_triangles )
             global_clustering_coeff = 3.0 * total_triangles / total_possible_triangles if total_possible_triangles > 0 else 0.0
 
             return global_clustering_coeff

{topologicpy-0.4.96 → topologicpy-0.4.98}/src/topologicpy/Shell.py

@@ -659,18 +659,18 @@ class Shell(Topology):
 
         """
 
-        from topologicpy.Wire import Wire
+        from topologicpy.Vertex import Vertex
 
         if not isinstance(shell, topologic.Shell):
             return None
         if not isinstance(vertex, topologic.Vertex):
             return None
         boundary = Shell.ExternalBoundary(shell, tolerance=tolerance)
-        if Wire.IsInternal(wire=boundary, vertex=vertex, tolerance=tolerance):
+        if Vertex.IsInternal(vertex, boundary, tolerance=tolerance):
             return True
         internal_boundaries = Shell.InternalBoundaries(shell, tolerance=tolerance)
         for ib in internal_boundaries:
-            if Wire.IsInternal(wire=ib, vertex=vertex, tolerance=tolerance):
+            if Vertex.IsInternal(vertex, ib, tolerance=tolerance):
                 return True
         return False
     
@@ -1295,7 +1295,6 @@ class Shell(Topology):
         if not roof:
             return None
         shell = Shell.Skeleton(flat_face, tolerance=tolerance)
-        print(shell)
         faces = Shell.Faces(shell)
         Topology.Show(shell)
         if not faces:

{topologicpy-0.4.96 → topologicpy-0.4.98}/src/topologicpy/Topology.py

@@ -914,7 +914,15 @@ class Topology():
                 return None
         # Edge:
         elif isinstance(topologyA, topologic.Edge):
-            if isinstance(topologyB, topologic.Shell):
+            if isinstance(topologyB, topologic.Wire):
+                vertices = Topology.Vertices(topologyB)
+                edges = Topology.Edges(topologyB)
+                intersections = [topologyA.Intersect(x) for x in vertices]
+                intersections += [topologyA.Intersect(x) for x in edges]
+                intersections = [x for x in intersections if not x == None]
+                if len(intersections) == 0:
+                    return None
+            elif isinstance(topologyB, topologic.Shell):
                 vertices = Topology.Vertices(topologyB)
                 edges = Topology.Edges(topologyB)
                 faces = Topology.Faces(topologyB)
@@ -3599,7 +3607,6 @@ class Topology():
             return_topology = Cell.ByFaces(faces, tolerance=tolerance)
             if return_topology == None:
                 return_topology = CellComplex.ByFaces(faces, tolerance=tolerance)
-                #print("Return Topology:", return_topology)
                 if return_topology == None:
                     print("Topology.Fix - Error: Desired topologyType cannot be achieved. Returning original topology.")
                     return topology
@@ -4389,7 +4396,6 @@ class Topology():
             return [a,b,c,d]
 
         if not isinstance(topology, topologic.Topology):
-            print("Topology.IsPlanar", topology)
             print("Topology.IsPlanar - Error: the input topology parameter is not a valid topology. Returning None.")
             return None
         vertices = Topology.Vertices(topology)
@@ -5138,7 +5144,7 @@ class Topology():
 
         """
         if not len(verticesA) == len(verticesB):
-            print("Error - Topology.ReplaceVertices: VerticesA and VerticesB must be the same length")
+            print("Topology.ReplaceVertices - Error: The input parameters verticesA and verticesB must be the same length")
             return None
         from topologicpy.Vertex import Vertex
         geom = Topology.Geometry(topology, mantissa=mantissa)
@@ -5186,6 +5192,7 @@ class Topology():
 
         """
         from topologicpy.Vertex import Vertex
+        from topologicpy.Dictionary import Dictionary
 
         def rotate_vertex_3d(vertex, axis, angle_degrees, origin):
             vertex = np.array(vertex)  # Vertex to be rotated
@@ -5208,12 +5215,11 @@ class Topology():
             translated_vertex = vertex - origin
             rotated_vertex = np.dot(rotation_matrix, translated_vertex) + origin
             
-            rotated_vertex = [v for v in rotated_vertex]
+            rotated_vertex = [v for v in rotated_vertex] 
             return rotated_vertex
 
         if not isinstance(topology, topologic.Topology):
             print("Topology.Rotate - Error: The input topology parameter is not a valid topologic topology. Returning None.")
-            print("The topology is", topology)
             return None
         if not origin:
             origin = Vertex.ByCoordinates(0,0,0)
@@ -6468,7 +6474,6 @@ class Topology():
         for i, sink in enumerate(sink_items):
             mapItem = sinkMap[sink.ID]
             newDict = Dictionary.ByKeysValues(mapItem.sinkKeys, mapItem.sinkValues)
-            # print("newDict", Dictionary.Keys(newDict), Dictionary.Values(newDict))
             _ = sinks[i].SetDictionary(newDict)
         return {"sources": sources, "sinks": sinks}
 

{topologicpy-0.4.96 → topologicpy-0.4.98}/src/topologicpy/Vertex.py

@@ -698,10 +698,16 @@ class Vertex(Topology):
                 fused_vertices.append(fused_vertex)
 
             return fused_vertices
-
         def count_decimal_points(vertex):
             # Count the number of decimal points in the coordinates
-            return max(len(str(coord).split('.')[1]) for coord in vertex)
+            decimals_list = []
+            for coord in vertex:
+                coord_str = str(coord)
+                if '.' in coord_str:
+                    decimals_list.append(len(coord_str.split('.')[1]))
+                elif 'e' in coord_str:
+                    decimals_list.append(int(coord_str.split('e')[1].replace('-','')))
+            return max(decimals_list)
 
 
         if not isinstance(vertices, list):

{topologicpy-0.4.96 → topologicpy-0.4.98}/src/topologicpy/Wire.py

@@ -2906,6 +2906,21 @@ class Wire(Topology):
 
         """
         from topologicpy.Vertex import Vertex
+        def compute_u(u):
+            def count_decimal_places(number):
+                try:
+                    # Convert the number to a string to analyze decimal places
+                    num_str = str(number)
+                    # Split the number into integer and decimal parts
+                    integer_part, decimal_part = num_str.split('.')
+                    # Return the length of the decimal part
+                    return len(decimal_part)
+                except ValueError:
+                    # If there's no decimal part, return 0
+                    return 0
+            dp = count_decimal_places(u)
+            u = -(int(u) - u)
+            return round(u,dp)
 
         if not isinstance(wire, topologic.Wire):
             print("Wire.VertexByDistance - Error: The input wire parameter is not a valid topologic wire. Returning None.")
@@ -2918,9 +2933,6 @@ class Wire(Topology):
             return Wire.StartVertex(wire)
         if abs(distance - wire_length) < tolerance:
             return Wire.EndVertex(wire)
-        if abs(distance) > wire_length:
-            print("Wire.VertexByDistance - Error: The input distance parameter is larger than the wire's length. Returning None.")
-            return None
         if not Wire.IsManifold(wire):
             print("Wire.VertexAtParameter - Error: The input wire parameter is non-manifold. Returning None.")
             return None
@@ -2929,18 +2941,9 @@ class Wire(Topology):
         if not isinstance(origin, topologic.Vertex):
             print("Wire.VertexByDistance - Error: The input origin parameter is not a valid topologic vertex. Returning None.")
             return None
-        if not Wire.IsInternal(wire, origin, tolerance=tolerance):
+        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 distance < 0:
-            if Wire.VertexDistance(wire, Wire.StartVertex(wire), origin) < abs(distance):
-                print("Wire.VertexByDistance - Error: The resulting vertex would fall outside the wire. Returning None.")
-                return None
-        else:
-            if Wire.VertexDistance(wire, Wire.EndVertex(wire), origin) < distance:
-                print("Wire.VertexByDistance - Error: The resulting vertex would fall outside the wire. Returning None.")
-                return None
-        
         if Vertex.Distance(Wire.StartVertex(wire), origin) < tolerance:
             u = distance/wire_length
         elif Vertex.Distance(Wire.EndVertex(wire), origin) < tolerance:
@@ -2948,7 +2951,8 @@ class Wire(Topology):
         else:
             d = Wire.VertexDistance(wire, origin) + distance
             u = d/wire_length
-        return Wire.VertexByParameter(wire, u=u)
+
+        return Wire.VertexByParameter(wire, u=compute_u(u))
     
     @staticmethod
     def VertexByParameter(wire: topologic.Wire, u: float = 0) -> topologic.Vertex:

{topologicpy-0.4.96 → topologicpy-0.4.98}/src/topologicpy/__init__.py

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

{topologicpy-0.4.96 → topologicpy-0.4.98/src/topologicpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.4.96
+Version: 0.4.98
 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