PyPI - topologicpy - Versions diffs - 0.7.66__py3-none-any.whl → 0.7.68__py3-none-any.whl - Mend

topologicpy 0.7.66py3-none-any.whl → 0.7.68py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

topologicpy/Cell.py +6 -4
topologicpy/CellComplex.py +2 -20
topologicpy/Cluster.py +41 -66
topologicpy/Edge.py +1 -1
topologicpy/EnergyModel.py +4 -4
topologicpy/Face.py +28 -36
topologicpy/Graph.py +111 -169
topologicpy/Grid.py +2 -3
topologicpy/Honeybee.py +6 -9
topologicpy/Plotly.py +29 -6
topologicpy/Shell.py +10 -13
topologicpy/Topology.py +137 -123
topologicpy/Vertex.py +3 -6
topologicpy/Wire.py +16 -15
topologicpy/version.py +1 -1
{topologicpy-0.7.66.dist-info → topologicpy-0.7.68.dist-info}/METADATA +1 -1
topologicpy-0.7.68.dist-info/RECORD +36 -0
topologicpy-0.7.66.dist-info/RECORD +0 -36
{topologicpy-0.7.66.dist-info → topologicpy-0.7.68.dist-info}/LICENSE +0 -0
{topologicpy-0.7.66.dist-info → topologicpy-0.7.68.dist-info}/WHEEL +0 -0
{topologicpy-0.7.66.dist-info → topologicpy-0.7.68.dist-info}/top_level.txt +0 -0

topologicpy/Topology.py CHANGED Viewed

@@ -442,362 +442,362 @@ class Topology():
         if Topology.IsInstance(topology, "Vertex"):
             if topologyType.lower() == "vertex":
                 try:
-                    _ = topology.AdjacentVertices(hostTopology, adjacentTopologies)
+                    _ = topology.AdjacentVertices(hostTopology, adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Vertices(hostTopology, adjacentTopologies)
+                        _ = topology.Vertices(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "edge":
                 try:
-                    _ = topologic.VertexUtility.AdjacentEdges(topology, hostTopology, adjacentTopologies)
+                    _ = topologic.VertexUtility.AdjacentEdges(topology, hostTopology, adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Edges(hostTopology, adjacentTopologies)
+                        _ = topology.Edges(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "wire":
                 try:
-                    _ = topologic.VertexUtility.AdjacentWires(topology, hostTopology, adjacentTopologies)
+                    _ = topologic.VertexUtility.AdjacentWires(topology, hostTopology, adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Wires(hostTopology, adjacentTopologies)
+                        _ = topology.Wires(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "face":
                 try:
-                    _ = topologic.VertexUtility.AdjacentFaces(topology, hostTopology, adjacentTopologies)
+                    _ = topologic.VertexUtility.AdjacentFaces(topology, hostTopology, adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Faces(hostTopology, adjacentTopologies)
+                        _ = topology.Faces(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "shell":
                 try:
-                    _ = topologic.VertexUtility.AdjacentShells(topology, hostTopology, adjacentTopologies)
+                    _ = topologic.VertexUtility.AdjacentShells(topology, hostTopology, adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Shells(hostTopology, adjacentTopologies)
+                        _ = topology.Shells(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "cell":
                 try:
-                    _ = topologic.VertexUtility.AdjacentCells(topology, hostTopology, adjacentTopologies)
+                    _ = topologic.VertexUtility.AdjacentCells(topology, hostTopology, adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Cells(hostTopology, adjacentTopologies)
+                        _ = topology.Cells(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "cellcomplex":
                 try:
-                    _ = topologic.VertexUtility.AdjacentCellComplexes(topology, hostTopology, adjacentTopologies)
+                    _ = topologic.VertexUtility.AdjacentCellComplexes(topology, hostTopology, adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.CellComplexes(hostTopology, adjacentTopologies)
+                        _ = topology.CellComplexes(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
         elif Topology.IsInstance(topology, "Edge"):
             if topologyType.lower() == "vertex":
                 try:
-                    _ = topology.Vertices(hostTopology, adjacentTopologies)
+                    _ = topology.Vertices(hostTopology, adjacentTopologies) # Hook to Core
                 except:
                     error = True
             elif topologyType.lower() == "edge":
                 try:
-                    _ = topology.AdjacentEdges(hostTopology, adjacentTopologies)
+                    _ = topology.AdjacentEdges(hostTopology, adjacentTopologies) # Hook to Core
                 except:
                     error = True
             elif topologyType.lower() == "wire":
                 try:
-                    _ = topologic.EdgeUtility.AdjacentWires(topology, adjacentTopologies)
+                    _ = topologic.EdgeUtility.AdjacentWires(topology, adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Wires(hostTopology, adjacentTopologies)
+                        _ = topology.Wires(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "face":
                 try:
-                    _ = topologic.EdgeUtility.AdjacentFaces(topology, adjacentTopologies)
+                    _ = topologic.EdgeUtility.AdjacentFaces(topology, adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Faces(hostTopology, adjacentTopologies)
+                        _ = topology.Faces(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "shell":
                 try:
-                    _ = topologic.EdgeUtility.AdjacentShells(adjacentTopologies)
+                    _ = topologic.EdgeUtility.AdjacentShells(adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Shells(hostTopology, adjacentTopologies)
+                        _ = topology.Shells(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "cell":
                 try:
-                    _ = topologic.EdgeUtility.AdjacentCells(adjacentTopologies)
+                    _ = topologic.EdgeUtility.AdjacentCells(adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Cells(hostTopology, adjacentTopologies)
+                        _ = topology.Cells(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "cellcomplex":
                 try:
-                    _ = topologic.EdgeUtility.AdjacentCellComplexes(adjacentTopologies)
+                    _ = topologic.EdgeUtility.AdjacentCellComplexes(adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.CellComplexes(hostTopology, adjacentTopologies)
+                        _ = topology.CellComplexes(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
         elif Topology.IsInstance(topology, "Wire"):
             if topologyType.lower() == "vertex":
                 try:
-                    _ = topologic.WireUtility.AdjacentVertices(topology, adjacentTopologies)
+                    _ = topologic.WireUtility.AdjacentVertices(topology, adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Vertices(hostTopology, adjacentTopologies)
+                        _ = topology.Vertices(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "edge":
                 try:
-                    _ = topologic.WireUtility.AdjacentEdges(topology, adjacentTopologies)
+                    _ = topologic.WireUtility.AdjacentEdges(topology, adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Edges(hostTopology, adjacentTopologies)
+                        _ = topology.Edges(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "wire":
                 try:
-                    _ = topologic.WireUtility.AdjacentWires(topology, adjacentTopologies)
+                    _ = topologic.WireUtility.AdjacentWires(topology, adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Wires(hostTopology, adjacentTopologies)
+                        _ = topology.Wires(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "face":
                 try:
-                    _ = topologic.WireUtility.AdjacentFaces(topology, adjacentTopologies)
+                    _ = topologic.WireUtility.AdjacentFaces(topology, adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Faces(hostTopology, adjacentTopologies)
+                        _ = topology.Faces(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "shell":
                 try:
-                    _ = topologic.WireUtility.AdjacentShells(adjacentTopologies)
+                    _ = topologic.WireUtility.AdjacentShells(adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Shells(hostTopology, adjacentTopologies)
+                        _ = topology.Shells(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "cell":
                 try:
-                    _ = topologic.WireUtility.AdjacentCells(adjacentTopologies)
+                    _ = topologic.WireUtility.AdjacentCells(adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Cells(hostTopology, adjacentTopologies)
+                        _ = topology.Cells(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "cellcomplex":
                 try:
-                    _ = topologic.WireUtility.AdjacentCellComplexes(adjacentTopologies)
+                    _ = topologic.WireUtility.AdjacentCellComplexes(adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.CellComplexes(hostTopology, adjacentTopologies)
+                        _ = topology.CellComplexes(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
         elif Topology.IsInstance(topology, "Face"):
             if topologyType.lower() == "vertex":
                 try:
-                    _ = topologic.FaceUtility.AdjacentVertices(topology, adjacentTopologies)
+                    _ = topologic.FaceUtility.AdjacentVertices(topology, adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Vertices(hostTopology, adjacentTopologies)
+                        _ = topology.Vertices(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "edge":
                 try:
-                    _ = topologic.FaceUtility.AdjacentEdges(topology, adjacentTopologies)
+                    _ = topologic.FaceUtility.AdjacentEdges(topology, adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Edges(hostTopology, adjacentTopologies)
+                        _ = topology.Edges(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "wire":
                 try:
-                    _ = topologic.FaceUtility.AdjacentWires(topology, adjacentTopologies)
+                    _ = topologic.FaceUtility.AdjacentWires(topology, adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Wires(hostTopology, adjacentTopologies)
+                        _ = topology.Wires(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "face":
-                _ = topology.AdjacentFaces(hostTopology, adjacentTopologies)
+                _ = topology.AdjacentFaces(hostTopology, adjacentTopologies) # Hook to Core
             elif topologyType.lower() == "shell":
                 try:
-                    _ = topologic.FaceUtility.AdjacentShells(adjacentTopologies)
+                    _ = topologic.FaceUtility.AdjacentShells(adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Shells(hostTopology, adjacentTopologies)
+                        _ = topology.Shells(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "cell":
                 try:
-                    _ = topologic.FaceUtility.AdjacentCells(adjacentTopologies)
+                    _ = topologic.FaceUtility.AdjacentCells(adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Cells(hostTopology, adjacentTopologies)
+                        _ = topology.Cells(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "cellcomplex":
                 try:
-                    _ = topologic.FaceUtility.AdjacentCellComplexes(adjacentTopologies)
+                    _ = topologic.FaceUtility.AdjacentCellComplexes(adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.CellComplexes(hostTopology, adjacentTopologies)
+                        _ = topology.CellComplexes(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
         elif Topology.IsInstance(topology, "Shell"):
             if topologyType.lower() == "vertex":
                 try:
-                    _ = topologic.ShellUtility.AdjacentVertices(topology, adjacentTopologies)
+                    _ = topologic.ShellUtility.AdjacentVertices(topology, adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Vertices(hostTopology, adjacentTopologies)
+                        _ = topology.Vertices(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "edge":
                 try:
-                    _ = topologic.ShellUtility.AdjacentEdges(topology, adjacentTopologies)
+                    _ = topologic.ShellUtility.AdjacentEdges(topology, adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Edges(hostTopology, adjacentTopologies)
+                        _ = topology.Edges(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "wire":
                 try:
-                    _ = topologic.ShellUtility.AdjacentWires(topology, adjacentTopologies)
+                    _ = topologic.ShellUtility.AdjacentWires(topology, adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Wires(hostTopology, adjacentTopologies)
+                        _ = topology.Wires(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "face":
                 try:
-                    _ = topologic.ShellUtility.AdjacentFaces(topology, adjacentTopologies)
+                    _ = topologic.ShellUtility.AdjacentFaces(topology, adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Faces(hostTopology, adjacentTopologies)
+                        _ = topology.Faces(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "shell":
                 try:
-                    _ = topologic.ShellUtility.AdjacentShells(adjacentTopologies)
+                    _ = topologic.ShellUtility.AdjacentShells(adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Shells(hostTopology, adjacentTopologies)
+                        _ = topology.Shells(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "cell":
                 try:
-                    _ = topologic.ShellUtility.AdjacentCells(adjacentTopologies)
+                    _ = topologic.ShellUtility.AdjacentCells(adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Cells(hostTopology, adjacentTopologies)
+                        _ = topology.Cells(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "cellcomplex":
                 try:
-                    _ = topologic.ShellUtility.AdjacentCellComplexes(adjacentTopologies)
+                    _ = topologic.ShellUtility.AdjacentCellComplexes(adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.CellComplexes(hostTopology, adjacentTopologies)
+                        _ = topology.CellComplexes(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
         elif Topology.IsInstance(topology, "Cell"):
             if topologyType.lower() == "vertex":
                 try:
-                    _ = topologic.CellUtility.AdjacentVertices(topology, adjacentTopologies)
+                    _ = topologic.CellUtility.AdjacentVertices(topology, adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Vertices(hostTopology, adjacentTopologies)
+                        _ = topology.Vertices(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "edge":
                 try:
-                    _ = topologic.CellUtility.AdjacentEdges(topology, adjacentTopologies)
+                    _ = topologic.CellUtility.AdjacentEdges(topology, adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Edges(hostTopology, adjacentTopologies)
+                        _ = topology.Edges(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "wire":
                 try:
-                    _ = topologic.CellUtility.AdjacentWires(topology, adjacentTopologies)
+                    _ = topologic.CellUtility.AdjacentWires(topology, adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Wires(hostTopology, adjacentTopologies)
+                        _ = topology.Wires(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "face":
                 try:
-                    _ = topologic.CellUtility.AdjacentFaces(topology, adjacentTopologies)
+                    _ = topologic.CellUtility.AdjacentFaces(topology, adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Faces(hostTopology, adjacentTopologies)
+                        _ = topology.Faces(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "shell":
                 try:
-                    _ = topologic.CellUtility.AdjacentShells(adjacentTopologies)
+                    _ = topologic.CellUtility.AdjacentShells(adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Shells(hostTopology, adjacentTopologies)
+                        _ = topology.Shells(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "cell":
                 try:
-                    _ = topology.AdjacentCells(hostTopology, adjacentTopologies)
+                    _ = topology.AdjacentCells(hostTopology, adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.Cells(hostTopology, adjacentTopologies)
+                        _ = topology.Cells(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
             elif topologyType.lower() == "cellcomplex":
                 try:
-                    _ = topologic.CellUtility.AdjacentCellComplexes(adjacentTopologies)
+                    _ = topologic.CellUtility.AdjacentCellComplexes(adjacentTopologies) # Hook to Core
                 except:
                     try:
-                        _ = topology.CellComplexes(hostTopology, adjacentTopologies)
+                        _ = topology.CellComplexes(hostTopology, adjacentTopologies) # Hook to Core
                     except:
                         error = True
         elif Topology.IsInstance(topology, "CellComplex"):
             if topologyType.lower() == "vertex":
                 try:
-                    _ = topology.Vertices(hostTopology, adjacentTopologies)
+                    _ = topology.Vertices(hostTopology, adjacentTopologies) # Hook to Core
                 except:
                     error = True
             elif topologyType.lower() == "edge":
                 try:
-                    _ = topology.Edges(hostTopology, adjacentTopologies)
+                    _ = topology.Edges(hostTopology, adjacentTopologies) # Hook to Core
                 except:
                     error = True
             elif topologyType.lower() == "wire":
                 try:
-                    _ = topology.Wires(hostTopology, adjacentTopologies)
+                    _ = topology.Wires(hostTopology, adjacentTopologies) # Hook to Core
                 except:
                     error = True
             elif topologyType.lower() == "face":
                 try:
-                    _ = topology.Faces(hostTopology, adjacentTopologies)
+                    _ = topology.Faces(hostTopology, adjacentTopologies) # Hook to Core
                 except:
                     error = True
             elif topologyType.lower() == "shell":
                 try:
-                    _ = topology.Shells(hostTopology, adjacentTopologies)
+                    _ = topology.Shells(hostTopology, adjacentTopologies) # Hook to Core
                 except:
                     error = True
             elif topologyType.lower() == "cell":
                 try:
-                    _ = topology.Cells(hostTopology, adjacentTopologies)
+                    _ = topology.Cells(hostTopology, adjacentTopologies) # Hook to Core
                 except:
                     error = True
             elif topologyType.lower() == "cellcomplex":
@@ -1314,8 +1314,7 @@ class Topology():
         from topologicpy.Dictionary import Dictionary
         def bb(topology):
-            vertices = []
-            _ = topology.Vertices(None, vertices)
+            vertices = Topology.Vertices(topology)
             x = []
             y = []
             z = []
@@ -3033,16 +3032,14 @@ class Topology():
         Returns
         -------
         list
-            The list of imported topologies.
+            The list of imported topologies (Warning: the list could contain 0, 1, or many topologies, but this method will always return a list)
         """
         if not file:
             print("Topology.ByJSONFile - Error: the input file parameter is not a valid file. Returning None.")
             return None
-        json_string = json.load(file)
-        #jsonData = json.load(file)
-        #jsonString = json.dumps(jsonData)
-        return Topology.ByJSONString(json_string, tolerance=tolerance)
+        json_dict = json.load(file)
+        return Topology.ByJSONDictionary(json_dict, tolerance=tolerance)
     @staticmethod
     def ByJSONPath(path, tolerance=0.0001):
@@ -3067,26 +3064,26 @@ class Topology():
             print("Topology.ByJSONPath - Error: the input path parameter is not a valid path. Returning None.")
             return None
         with open(path) as file:
-            json_string = json.load(file)
-        entities = Topology.ByJSONString(json_string, tolerance=tolerance)
+            json_dict = json.load(file)
+        entities = Topology.ByJSONDictionary(json_dict, tolerance=tolerance)
         return entities
     @staticmethod
-    def ByJSONString(string, tolerance=0.0001):
+    def ByJSONDictionary(jsonDictionary, tolerance=0.0001):
         """
-        Imports the topology from a JSON string.
+        Imports the topology from a JSON dictionary.
         Parameters
         ----------
-        string : str
-            The input JSON string.
+        jsonDictionary : dict
+            The input JSON dictionary.
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
         Returns
         -------
-        list or topologicpy.Topology
-            The list of imported topologies. If the list only contains one element, it returns that element.
+        list
+            The list of imported topologies (Warning: the list could contain 0, 1, or many topologies, but this method will always return a list)
         """
         from topologicpy.Vertex import Vertex
@@ -3110,9 +3107,7 @@ class Topology():
         vertex_apertures = []
         edge_apertures = []
         face_apertures = []
-        # Step 2: Create Entities and handle apertures
-        json_dictionary = json.loads(string)
-        for entity in json_dictionary:
+        for entity in jsonDictionary:
             entity_type = entity['type']
             entity_dict = Dictionary.ByKeysValues(keys=list(entity['dictionary'].keys()),
                                                 values=list(entity['dictionary'].values()))
@@ -3280,6 +3275,28 @@ class Topology():
                     entity = Topology.AddApertures(entity, vertex_apertures, subTopologyType="Vertex", tolerance=0.001)
                 top_level_list.append(entity)
         return top_level_list
+    @staticmethod
+    def ByJSONString(string, tolerance=0.0001):
+        """
+        Imports the topology from a JSON string.
+        Parameters
+        ----------
+        string : str
+            The input JSON string.
+        tolerance : float , optional
+            The desired tolerance. The default is 0.0001.
+        Returns
+        -------
+        list
+            The list of imported topologies (Warning: the list could contain 0, 1, or many topologies, but this method will always return a list)
+        """
+        json_dict = json.loads(string)
+        return Topology.ByJSONDictionary(json_dict, tolerance=tolerance)
     @staticmethod
     def ByOBJFile(objFile, mtlFile = None,
@@ -4078,8 +4095,7 @@ class Topology():
         def convexHull3D(item, tolerance, option):
             if item:
-                vertices = []
-                _ = item.Vertices(None, vertices)
+                vertices = Topology.Vertices(item)
                 pointList = []
                 for v in vertices:
                     pointList.append(Vertex.Coordinates(v, mantissa=mantissa))
@@ -5042,7 +5058,6 @@ class Topology():
         from topologicpy.Face import Face
         from topologicpy.Cell import Cell
         from topologicpy.Dictionary import Dictionary
-        from topologicpy.Aperture import Aperture
         def getUUID(topology, uuidKey="uuid"):
             d = Topology.Dictionary(topology)
@@ -5068,8 +5083,7 @@ class Topology():
             uuidOne = getUUID(topology, uuidKey=uuidKey)
             returnDict['type'] = "Edge"
             returnDict['uuid'] = uuidOne
-            edge_vertices = Edge.Vertices(topology)
-            returnDict['vertices'] = [getUUID(v, uuidKey=uuidKey) for v in Edge.Vertices(topology)]
+            returnDict['vertices'] = [getUUID(v, uuidKey=uuidKey) for v in Topology.Vertices(topology)]
             returnDict['dictionary'] = Dictionary.PythonDictionary(Topology.Dictionary(topology))
             return returnDict
@@ -5693,7 +5707,7 @@ class Topology():
         if Topology.Type(topology) == Topology.TypeID("Vertex"): #input is a vertex, just add it and process it
             topVerts.append(topology)
         else:
-            _ = topology.Vertices(None, topVerts)
+            topVerts = Topology.Vertices(topology)
         for aVertex in topVerts:
             try:
                 vertices.index(Vertex.Coordinates(aVertex, mantissa=mantissa)) # Vertex already in list
@@ -6367,7 +6381,7 @@ class Topology():
             return topology
         def faces_on_same_plane(face1, face2, epsilon=1e-6):
-            vertices = Face.Vertices(face1)
+            vertices = Topology.Vertices(face1)
             distances = []
             for v in vertices:
                 distances.append(Vertex.PerpendicularDistance(v, face=face2, mantissa=6))
@@ -7773,7 +7787,7 @@ class Topology():
                     try:
                         returnTopology = CellComplex.ByWires(topologies, tolerance)
                         try:
-                            returnTopology = returnTopology.ExternalBoundary()
+                            returnTopology = CellComplex.ExternalBoundary(returnTopology)
                         except:
                             pass
                     except:
@@ -8171,23 +8185,23 @@ class Topology():
             return [topology]
         subTopologies = []
         if subTopologyType.lower() == "vertex":
-            _ = topology.Vertices(None, subTopologies)
+            _ = topology.Vertices(None, subTopologies) # Hook to Core
         elif subTopologyType.lower() == "edge":
-            _ = topology.Edges(None, subTopologies)
+            _ = topology.Edges(None, subTopologies) # Hook to Core
         elif subTopologyType.lower() == "wire":
-            _ = topology.Wires(None, subTopologies)
+            _ = topology.Wires(None, subTopologies) # Hook to Core
         elif subTopologyType.lower() == "face":
-            _ = topology.Faces(None, subTopologies)
+            _ = topology.Faces(None, subTopologies) # Hook to Core
         elif subTopologyType.lower() == "shell":
-            _ = topology.Shells(None, subTopologies)
+            _ = topology.Shells(None, subTopologies) # Hook to Core
         elif subTopologyType.lower() == "cell":
-            _ = topology.Cells(None, subTopologies)
+            _ = topology.Cells(None, subTopologies) # Hook to Core
         elif subTopologyType.lower() == "cellcomplex":
-            _ = topology.CellComplexes(None, subTopologies)
+            _ = topology.CellComplexes(None, subTopologies) # Hook to Core
         elif subTopologyType.lower() == "cluster":
-            _ = topology.Clusters(None, subTopologies)
+            _ = topology.Clusters(None, subTopologies) # Hook to Core
         elif subTopologyType.lower() == "aperture":
-            subTopologies = Topology.Apertures(topology)
+            _ = topology.Apertures(None, subTopologies) # Hook to Core
         if not subTopologies:
             return [] # Make sure to return an empty list instead of None
         return subTopologies
@@ -8409,7 +8423,7 @@ class Topology():
             if Topology.Type(topology) == Topology.TypeID("Vertex"):
                 sinkVertices.append(topology)
             elif hidimSink >= Topology.TypeID("Vertex"):
-                topology.Vertices(None, sinkVertices)
+                sinkVertices = Topology.Vertices(topology)
             _ = Topology.TransferDictionaries(selectors, sinkVertices, tolerance=tolerance, numWorkers=numWorkers)
         if tranEdges == True:
             sinkEdges = []

topologicpy 0.7.66__py3-none-any.whl → 0.7.68__py3-none-any.whl

topologicpy 0.7.66py3-none-any.whl → 0.7.68py3-none-any.whl