topologicpy 0.4.24__tar.gz → 0.4.26__tar.gz

{topologicpy-0.4.24/src/topologicpy.egg-info → topologicpy-0.4.26}/PKG-INFO

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

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

{topologicpy-0.4.24 → topologicpy-0.4.26}/src/topologicpy/DGL.py

@@ -1532,8 +1532,10 @@ class DGL:
         """
         if not path:
             return None
-        file = open(path)
-        if not file:
+        try:
+            file = open(path)
+        except:
+            print("DGL.GraphsByDGCNNPath - Error: the DGCNN file is not a valid file. Returning None.")
             return None
         return DGL.GraphsByDGCNNFile(file=file, categories=categories, bidirectional=bidirectional)
 

{topologicpy-0.4.24 → topologicpy-0.4.26}/src/topologicpy/EnergyModel.py

@@ -115,7 +115,7 @@ class EnergyModel:
         return EnergyModel.ByOSMPath(path=path)
     
     @staticmethod
-    def ByTopology(building : topologic.CellComplex,
+    def ByTopology(building : topologic.Topology,
                    shadingSurfaces : topologic.Topology = None,
                    osModelPath : str = None,
                    weatherFilePath : str = None,
@@ -135,7 +135,7 @@ class EnergyModel:
 
         Parameters
         ----------
-        building : topologic.CellComplex
+        building : topologic.CellComplex or topologic.Cell
             The input building topology.
         shadingSurfaces : topologic.Topology , optional
             The input topology for shading surfaces. The default is None.
@@ -197,14 +197,22 @@ class EnergyModel:
         
         def getFloorLevels(building):
             from topologicpy.Vertex import Vertex
+            from topologicpy.Cell import Cell
             from topologicpy.CellComplex import CellComplex
-            from topologicpy.Dictionary import Dictionary
 
-            d = CellComplex.Decompose(building)
-            bhf = d['bottomHorizontalFaces']
-            ihf = d['internalHorizontalFaces']
-            thf = d ['topHorizontalFaces']
-            hf = bhf+ihf+thf
+            if isinstance(building, topologic.CellComplex):
+                d = CellComplex.Decompose(building)
+                bhf = d['bottomHorizontalFaces']
+                ihf = d['internalHorizontalFaces']
+                thf = d ['topHorizontalFaces']
+                hf = bhf+ihf+thf
+            elif isinstance(building, topologic.Cell):
+                d = Cell.Decompose(building)
+                bhf = d['bottomHorizontalFaces']
+                thf = d ['topHorizontalFaces']
+                hf = bhf+thf
+            else:
+                return None
             floorLevels = [Vertex.Z(Topology.Centroid(f)) for f in hf]
             floorLevels = list(set(floorLevels))
             floorLevels.sort()
@@ -267,7 +275,11 @@ class EnergyModel:
         osBuildingStorys.sort(key=lambda x: x.nominalZCoordinate().get())
         osSpaces = []
         spaceNames = []
-        for spaceNumber, buildingCell in enumerate(Topology.SubTopologies(building, "Cell")):
+        if isinstance(building, topologic.CellComplex):
+            building_cells = Topology.SubTopologies(building, "Cell")
+        elif isinstance(building, topologic.Cell):
+            building_cells = [building]
+        for spaceNumber, buildingCell in enumerate(building_cells):
             osSpace = openstudio.model.Space(osModel)
             osSpaceZ = buildingCell.CenterOfMass().Z()
             osBuildingStory = osBuildingStorys[0]

{topologicpy-0.4.24 → topologicpy-0.4.26}/src/topologicpy/Graph.py

@@ -367,7 +367,7 @@ class Graph:
             try:
                 from tqdm.auto import tqdm
             except:
-                print("DGL - Error: Could not import tqdm")
+                print("Graph.BetweenessCentrality - Error: Could not import tqdm")
 
         if not isinstance(graph, topologic.Graph):
             print("Graph.BetweenessCentrality - Error: The input graph is not a valid graph. Returning None.")
@@ -535,16 +535,19 @@ class Graph:
         if not nodes_file_path:
             print("Graph.ByCSVPath - Error: the input edges_file_path is not a valid path. Returning None.")
             return None
-        graphs_file = open(graphs_file_path)
-        if not graphs_file:
+        try:
+            graphs_file = open(graphs_file_path)
+        except:
             print("Graph.ByCSVPath - Error: the graphs file is not a valid file. Returning None.")
             return None
-        edges_file = open(edges_file_path)
-        if not edges_file:
+        try:
+            edges_file = open(edges_file_path)
+        except:
             print("Graph.ByCSVPath - Error: the edges file is not a valid file. Returning None.")
             return None
-        nodes_file = open(nodes_file_path)
-        if not nodes_file:
+        try:
+            nodes_file = open(nodes_file_path)
+        except:
             print("Graph.ByCSVPath - Error: the nodes file is not a valid file. Returning None.")
             return None
         return Graph.ByCSVFile(graphs_file, edges_file, nodes_file,
@@ -611,17 +614,17 @@ class Graph:
         # Using split by line
         lines = graphs_string.split('\n')[1:-1]
         lines = [l for l in lines if lines != None or lines != ""]
-        pd_graphs = pd.DataFrame([row.split(',') for row in lines], 
+        pd_graphs = pd.DataFrame([row.split(',')[0:3] for row in lines], 
                         columns=[graph_id_header, graph_label_header, num_nodes_header])
         
         lines = edges_string.split('\n')[1:-1]
         lines = [l for l in lines if lines != None or lines != ""]
-        edges = pd.DataFrame([row.split(',') for row in lines], 
+        edges = pd.DataFrame([row.split(',')[0:3] for row in lines], 
                         columns=[graph_id_header, src_header, dst_header])
 
         lines = nodes_string.split('\n')[1:-1]
         lines = [l for l in lines if lines[-1] != None or lines[-1] != ""]
-        nodes = pd.DataFrame([row.split(',') for row in lines], 
+        nodes = pd.DataFrame([row.split(',')[0:5] for row in lines], 
                         columns=[graph_id_header, node_label_header, node_X_header, node_Y_header, node_Z_header])
 
         graphs = []
@@ -648,7 +651,12 @@ class Graph:
             graph_dict["node_features"] = []
             num_nodes = num_nodes_dict[graph_id]
             graph_label = label_dict[graph_id]
-            labels.append(int(graph_label))
+            if graph_label.isnumeric():
+                if graph_label.isdecimal():
+                    graph_label = int(graph_label)
+                else:
+                    graph_label = float(graph_label)
+            labels.append(float(graph_label))
 
             # Find the nodes and their labels and features
             nodes_of_id = nodes_group.get_group(graph_id)
@@ -722,9 +730,10 @@ class Graph:
         if not path:
             print("Graph.ByDGCNNPath - Error: the input path is not a valid path. Returning None.")
             return None
-        file = open(path)
-        if not file:
-            print("Graph.ByDGCNNPath - Error: the input file is not a valid file. Returning None.")
+        try:
+            file = open(path)
+        except:
+            print("Graph.ByDGCNNPath - Error: the DGCNN file is not a valid file. Returning None.")
             return None
         return Graph.ByDGCNNFile(file, key=key)
     

{topologicpy-0.4.24 → topologicpy-0.4.26}/src/topologicpy/Plotly.py

@@ -183,7 +183,7 @@ class Plotly:
         return df
 
     @staticmethod
-    def DataByGraph(graph, vertexColor="white", vertexSize=6, vertexLabelKey=None, vertexGroupKey=None, vertexGroups=[], showVertices=True, edgeColor="black", edgeWidth=1, edgeLabelKey=None, edgeGroupKey=None, edgeGroups=[], showEdges=True):
+    def DataByGraph(graph, vertexColor="white", vertexSize=6, vertexLabelKey=None, vertexGroupKey=None, vertexGroups=[], showVertices=True, edgeColor="black", edgeWidth=1, edgeLabelKey=None, edgeGroupKey=None, edgeGroups=[], showEdges=True, colorScale="viridis"):
         """
         Creates plotly vertex and edge data from the input graph.
 
@@ -193,8 +193,6 @@ class Plotly:
             The input graph.
         vertexLabelKey : str , optional
             The dictionary key to use to display the vertex label. The default is None.
-        vertexGroupKey : str , optional
-            The dictionary key to use to display the vertex group. The default is None.
         edgeLabelKey : str , optional
             The dictionary key to use to display the edge label. The default is None.
         edgeGroupKey : str , optional
@@ -217,13 +215,20 @@ class Plotly:
             - An hsv/hsva string (e.g. 'hsv(0,100%,100%)')
             - A named CSS color.
             The default is "black".
+        vertexGroupKey : str , optional
+            The dictionary key to use to display the vertex group. The default is None.
+        vertexGroups : list , optional
+            The list of vertex groups against which to index the color of the vertex. The default is [].
+        vertexLabelKey : str , optional
+            The dictionary key to use to display the vertex label. The default is None.
         vertexSize : float , optional
             The desired size of the vertices. The default is 1.1.
         showEdges : bool , optional
             If set to True the edges will be drawn. Otherwise, they will not be drawn. The default is True.
         showVertices : bool , optional
             If set to True the vertices will be drawn. Otherwise, they will not be drawn. The default is True.
-
+        colorScale : str , optional
+            The desired type of plotly color scales to use (e.g. "Viridis", "Plasma"). The default is "Viridis". For a full list of names, see https://plotly.com/python/builtin-colorscales/.
         Returns
         -------
         list
@@ -258,15 +263,18 @@ class Plotly:
                         except:
                             v_label = ""
                         try:
-                            v_group = str(Dictionary.ValueAtKey(d, key=vertexGroupKey)) or ""
+                            v_group = Dictionary.ValueAtKey(d, key=vertexGroupKey)
                         except:
-                            v_group = ""
+                            v_group = None
                     try:
                         v_groupList.append(vertexGroups.index(v_group))
                     except:
                         v_groupList.append(len(vertexGroups))
                     if not v_label == "" and not v_group == "":
-                        v_label = v_label+" ("+v_group+")"
+                        if v_group == 0:
+                            v_label = v_label+" (0)"
+                        else:
+                            v_label = v_label+" ("+str(v_group)+")"
                     v_labels.append(v_label)
             else:
                 for v in vertices:
@@ -287,7 +295,7 @@ class Plotly:
                 marker=dict(symbol='circle',
                                 size=vertexSize,
                                 color=v_groupList,
-                                colorscale='Viridis',
+                                colorscale=colorScale,
                                 line=dict(color=edgeColor, width=0.5)
                                 ),
                 text=v_labels,

{topologicpy-0.4.24 → topologicpy-0.4.26}/src/topologicpy/Topology.py

@@ -1287,9 +1287,10 @@ class Topology():
         if not path:
             print("Topology.ByBREPPath - Error: the input path is not a valid path. Returning None.")
             return None
-        file = open(path)
-        if not file:
-            print("Topology.ByBREPPath - Error: the input file is not a valid file. Returning None.")
+        try:
+            file = open(path)
+        except:
+            print("Topology.ByBREPPath - Error: the BREP file is not a valid file. Returning None.")
             return None
         return Topology.ByBREPFile(file)
     
@@ -1668,9 +1669,10 @@ class Topology():
         if not path:
             print("Topology.ByJSONPath - Error: the input path is not a valid path. Returning None.")
             return None
-        file = open(path)
-        if not file:
-            print("Topology.ByJSONPath - Error: the input file is not a valid file. Returning None.")
+        try:
+            file = open(path)
+        except:
+            print("Topology.ByJSONPath - Error: the JSON file is not a valid file. Returning None.")
             return None
         return Topology.ByJSONFile(file=file, tolerance=tolerance)
 
@@ -1959,7 +1961,11 @@ class Topology():
         if not path:
             print("Topology.ByOBJPath - Error: the input path is not a valid path. Returning None.")
             return None
-        file = open(path)
+        try:
+            file = open(path)
+        except:
+            print("Topology.ByOBJPath - Error: the OBJ file is not a valid file. Returning None.")
+            return None
         return Topology.ByOBJFile(file, transposeAxes=transposeAxes, progressBar=progressBar, renderer=renderer, tolerance=tolerance)
     
     @staticmethod
@@ -2184,7 +2190,11 @@ class Topology():
         if not path:
             print("Topology.ByXYZPath - Error: the input path is not a valid path. Returning None.")
             return None
-        file = open(path)
+        try:
+            file = open(path)
+        except:
+            print("Topology.ByXYZPath - Error: the XYZ file is not a valid file. Returning None.")
+            return None
         return Topology.ByXYZFile(file, frameIdKey=frameIdKey, vertexIdKey=frameIdKey)
     
     @staticmethod

{topologicpy-0.4.24 → topologicpy-0.4.26}/src/topologicpy/__init__.py

@@ -2,7 +2,7 @@ import sys
 import os, re
 from sys import platform
 
-__version__ = '0.4.24'
+__version__ = '0.4.26'
 __version_info__ = tuple([ int(num) for num in __version__.split('.')])
 
 if platform == 'win32':
@@ -14,7 +14,7 @@ sitePackagesFolderName = os.path.join(os.path.dirname(os.path.realpath(__file__)
 test1 = os.path.dirname(os.path.realpath(__file__))
 topologicFolderName = [filename for filename in os.listdir(sitePackagesFolderName) if filename.startswith("topologic")][0]
 topologicPath = os.path.join(sitePackagesFolderName, topologicFolderName)
-sys.path.append(topologicPath)
+sys.path.append(topologicPath.replace(".libs",""))
 
 import topologic
 

{topologicpy-0.4.24 → topologicpy-0.4.26/src/topologicpy.egg-info}/PKG-INFO

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