topologicpy 0.4.25__py3-none-any.whl → 0.4.26__py3-none-any.whl

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/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/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/__init__.py

@@ -2,7 +2,7 @@ import sys
 import os, re
 from sys import platform
 
-__version__ = '0.4.25'
+__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.25.dist-info → topologicpy-0.4.26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.4.25
+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.25.dist-info → topologicpy-0.4.26.dist-info}/RECORD

@@ -4,12 +4,12 @@ topologicpy/CellComplex.py,sha256=b-JBSWJhIEvtxaT8JYj4DnHmJwt4EiqLFe2SpufYmFg,29
 topologicpy/Cluster.py,sha256=lmsZhL_dSWCB1MspsB1iOWthLIDaeWWVYHFTRvWmU4k,27935
 topologicpy/Color.py,sha256=MWEXKVdx2OXs2W4GXEeJm-VJ7OnwDo9cmUGRhrJAflw,7914
 topologicpy/Context.py,sha256=cPxfxUScXcJVafSTnCTCNpRzBGSbu90D5i6uu26S5us,1643
-topologicpy/DGL.py,sha256=NrSElel3snznJtq8wR4sNIXE5sz1vuaXHa2o1XVyLLc,127886
+topologicpy/DGL.py,sha256=zYCjYs07ZJ3hNINK9_dsGTlDIwYlUI5o3yHaY_Xvwns,128004
 topologicpy/Dictionary.py,sha256=x92D7ciLUEcIlBWO5O_iHXcr93KvxVw56chsMUSBpjE,18426
 topologicpy/Edge.py,sha256=BdQyYTIkv5bvDq-FsZqfBNAaMBlYxZ3Cvg16jaPG_3o,32540
 topologicpy/EnergyModel.py,sha256=-E1RJB_ZZyF4W_E66MTA1ufMNTp7zfAgRdVkSZshewY,50517
 topologicpy/Face.py,sha256=0hO0y5AyTDJxQBK_dWIZxKw-2Sccy-zhhoTDcrTYCn8,75041
-topologicpy/Graph.py,sha256=tI1pO6JsXbiUDFqjgFm4W_DH1jOwzSYNtb8049k_Brw,216931
+topologicpy/Graph.py,sha256=hBBZ4IKNiXl2jwtn5VZJUZiUeD1BxQk3_2Y9GgWxWnY,217219
 topologicpy/Grid.py,sha256=rArW8J3vkhWt8dx9NDzCSyu4oMowUpsly7rEhsLPFII,16449
 topologicpy/Helper.py,sha256=MMe2VXvC9qSzzM8NtZ28F6LoG2G_n8lqIGkDTOvip-Q,8267
 topologicpy/Honeybee.py,sha256=Vy8e0Chv2EkzqyNcaK3y4QeSj89yY5pdbE8GZgVQyGw,19153
@@ -19,11 +19,11 @@ topologicpy/Plotly.py,sha256=bx050YMvTvdGzuvIGcU9u8mRVhUKUMiScsB7KuQofnE,89987
 topologicpy/Polyskel.py,sha256=jz5k5H6p4QRWe3bbMnyYbP9Iji6EQ1wdk3qQvcnbg08,15156
 topologicpy/Shell.py,sha256=R7P8VowcwKj1ndN7WCeNUxbcxSWvJHNrQfZ7BbeTCXw,56832
 topologicpy/Speckle.py,sha256=65IHXjuNhHAusy4kPp70wlPF8QueSPJ-85v6dPc0uo4,11548
-topologicpy/Topology.py,sha256=qpF7pNLZtFzUoSQMisl3bRSAwx97udR0cyNKXvilWY0,257045
+topologicpy/Topology.py,sha256=a8qmMu_IQfvrJZejWXA8yaA5ra89mGvZxAKlwl92tsw,257389
 topologicpy/Vector.py,sha256=TE0Rt7SZ4NQD0YR3ty3crhb7BYbRws_UJ-lj2ihxPXU,17988
 topologicpy/Vertex.py,sha256=wHQAgWX5GGbk42VyrCWcSD1ikYO868Kw8SrFEW001Cw,31431
 topologicpy/Wire.py,sha256=Xo0F0bXtxJsT1cTVX-pG0-eDlpnOqwSY99pRhpNdKNI,99555
-topologicpy/__init__.py,sha256=RcwchNB7pomxZi352Q0JqaIADkRmwejnYYojcihyAnA,642
+topologicpy/__init__.py,sha256=MwQ8fMhrnm9q_KQVOwHvSZafaPDOl65sLXzTOfoUFNc,662
 topologicpy/bin/linux/topologic/__init__.py,sha256=qdj8gyp_GtYre27ZdFiVdLzLViOgX62woBZLTy9K91c,58
 topologicpy/bin/linux/topologic/topologic.cpython-310-x86_64-linux-gnu.so,sha256=uvar01STZ8qu1c8fRmtYdVnK8evxBv305QScASXY9go,1852112
 topologicpy/bin/linux/topologic/topologic.cpython-311-x86_64-linux-gnu.so,sha256=42yjVWetFu_qn6-eZcDxgd_A8SQN_wHqkdw91txKt9U,1852112
@@ -66,8 +66,8 @@ topologicpy/bin/windows/topologic/topologic.cp310-win_amd64.pyd,sha256=F0sPLuMpD
 topologicpy/bin/windows/topologic/topologic.cp311-win_amd64.pyd,sha256=aBAJQj3OmJ58MOAF1ZIFybL_5fFK7FNR9hrIps6b6pc,1551872
 topologicpy/bin/windows/topologic/topologic.cp38-win_amd64.pyd,sha256=aLgNf54nbJmGc7Tdmkuy-V0m6B9zLxabIbpRwAy7cBA,1551360
 topologicpy/bin/windows/topologic/topologic.cp39-win_amd64.pyd,sha256=_8cp205hiRxkFHtzQQOweA4DhCPk8caH4kTVLWGQeVw,1411584
-topologicpy-0.4.25.dist-info/LICENSE,sha256=RUmXeeqj63bBySLJjEfhwb9OE7M8h9K6HuOBF3ASVyI,35697
-topologicpy-0.4.25.dist-info/METADATA,sha256=ofsHqCPUTh_PdCK5VmSR-6GgyBYlbMioIq-1fA5f1rU,6973
-topologicpy-0.4.25.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-topologicpy-0.4.25.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.4.25.dist-info/RECORD,,
+topologicpy-0.4.26.dist-info/LICENSE,sha256=RUmXeeqj63bBySLJjEfhwb9OE7M8h9K6HuOBF3ASVyI,35697
+topologicpy-0.4.26.dist-info/METADATA,sha256=cGhvrp-vK_LbwwpgbC4Tz-y89EdBjGSToQsOQ00RJnY,6973
+topologicpy-0.4.26.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+topologicpy-0.4.26.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.4.26.dist-info/RECORD,,