topologicpy 0.4.62__tar.gz → 0.4.64__tar.gz

{topologicpy-0.4.62/src/topologicpy.egg-info → topologicpy-0.4.64}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.4.62
+Version: 0.4.64
 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
@@ -13,8 +13,18 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy
+Requires-Dist: pandas
+Requires-Dist: scipy
+Requires-Dist: scikit-learn
+Requires-Dist: ifcopenshell
+Requires-Dist: ladybug
+Requires-Dist: honeybee
+Requires-Dist: honeybee-energy
+Requires-Dist: networkx
+Requires-Dist: openstudio
 Requires-Dist: tqdm
 Requires-Dist: plotly
+Requires-Dist: pyvis
 
 # topologicpy
 

{topologicpy-0.4.62 → topologicpy-0.4.64}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=61"]
 build-backend = "setuptools.build_meta"
 [project]
 name = "topologicpy"
-version = "0.4.62"
+version = "0.4.64"
 authors = [
   { name="Wassim Jabi", email="wassim.jabi@gmail.com" },
 ]
@@ -17,8 +17,18 @@ classifiers = [
 ]
 dependencies = [
     "numpy",
+    "pandas",
+    "scipy",
+    "scikit-learn",
+    "ifcopenshell",
+    "ladybug",
+    "honeybee",
+    "honeybee-energy",
+    "networkx",
+    "openstudio",
     "tqdm",
     "plotly",
+    "pyvis",
 ]
 [project.urls]
 "Homepage" = "https://github.com/wassimj/TopologicPy"

{topologicpy-0.4.62 → topologicpy-0.4.64}/src/topologicpy/Cell.py

@@ -3,7 +3,22 @@ import topologic
 from topologicpy.Wire import Wire
 from topologicpy.Topology import Topology
 import math
-
+import os
+
+try:
+    import numpy as np
+except:
+    print("Cell - Installing required numpy library.")
+    try:
+        os.system("pip install numpy")
+    except:
+        os.system("pip install numpy --user")
+    try:
+        import numpy as np
+        print("Cell - numpy library installed correctly.")
+    except:
+        raise Exception("Cell - Error: Could not import numpy.")
+    
 class Cell(Topology):
     @staticmethod
     def Area(cell: topologic.Cell, mantissa: int = 6) -> float:

{topologicpy-0.4.62 → topologicpy-0.4.64}/src/topologicpy/CellComplex.py

@@ -1,6 +1,20 @@
 import topologic
-import warnings
 import math
+import os
+
+try:
+    import numpy as np
+except:
+    print("CellComplex - Installing required numpy library.")
+    try:
+        os.system("pip install numpy")
+    except:
+        os.system("pip install numpy --user")
+    try:
+        import numpy as np
+        print("CellComplex - numpy library installed correctly.")
+    except:
+        raise Exception("CellComplex - Error: Could not import numpy.")
 
 class CellComplex(topologic.CellComplex):
     @staticmethod

{topologicpy-0.4.62 → topologicpy-0.4.64}/src/topologicpy/Cluster.py

@@ -1,5 +1,35 @@
 import topologicpy
 import topologic
+import os
+
+try:
+    import numpy as np
+except:
+    print("Cluster - Installing required numpy library.")
+    try:
+        os.system("pip install numpy")
+    except:
+        os.system("pip install numpy --user")
+    try:
+        import numpy as np
+        print("Cluster - numpy library installed correctly.")
+    except:
+        raise Exception("Cluster - Error: Could not import numpy.")
+
+try:
+    from scipy.spatial.distance import pdist, squareform
+except:
+    print("Cluster - Installing required scipy library.")
+    try:
+        os.system("pip install scipy")
+    except:
+        os.system("pip install scipy --user")
+    try:
+        from scipy.spatial.distance import pdist, squareform
+        print("Cluster - scipy library installed correctly.")
+    except:
+        raise Exception("Cluster - Error: Could not import scipy.")
+
 class Cluster(topologic.Cluster):
     @staticmethod
     def ByFormula(formula, xRange=None, yRange=None, xString="X", yString="Y"):
@@ -208,9 +238,6 @@ class Cluster(topologic.Cluster):
         from topologicpy.Topology import Topology
         from topologicpy.Dictionary import Dictionary
 
-        import numpy as np
-        from scipy.spatial.distance import pdist, squareform
-
         def dbscan_3d_indices(data, eps, min_samples):
             """
             DBSCAN clustering algorithm for 3D points.

{topologicpy-0.4.62 → topologicpy-0.4.64}/src/topologicpy/DGL.py

@@ -1,33 +1,36 @@
-import topologicpy
-import topologic
-from topologicpy.Dictionary import Dictionary
 import os
 import random
-import time
-from datetime import datetime
 import copy
-import sys
-import subprocess
 os.environ["DGLBACKEND"] = "pytorch"
 
 try:
     import numpy as np
 except:
-    call = [sys.executable, '-m', 'pip', 'install', 'numpy', '-t', sys.path[0]]
-    subprocess.run(call)
+    print("DGL - Installing required numpy library.")
+    try:
+        os.system("pip install numpy")
+    except:
+        os.system("pip install numpy --user")
     try:
         import numpy as np
+        print("DGL - numpy library installed correctly.")
     except:
-        print("DGL - Error: Could not import numpy.")
+        raise Exception("DGL - Error: Could not import numpy.")
+
 try:
     import pandas as pd
 except:
-    call = [sys.executable, '-m', 'pip', 'install', 'pandas', '-t', sys.path[0]]
-    subprocess.run(call)
+    print("DGL - Installing required pandas library.")
+    try:
+        os.system("pip install pandas")
+    except:
+        os.system("pip install pandas --user")
     try:
         import pandas as pd
+        print("DGL - pandas library installed correctly.")
     except:
-        print("DGL - Error: Could not import pandas")
+        raise Exception("DGL - Error: Could not import pandas.")
+
 try:
     import torch
     import torch.nn as nn
@@ -35,16 +38,21 @@ try:
     from torch.utils.data.sampler import SubsetRandomSampler
     from torch.utils.data import DataLoader, ConcatDataset
 except:
-    call = [sys.executable, '-m', 'pip', 'install', 'torch', '-t', sys.path[0]]
-    subprocess.run(call)
+    print("DGL - Installing required torch library.")
+    try:
+        os.system("pip install torch")
+    except:
+        os.system("pip install torch --user")
     try:
         import torch
         import torch.nn as nn
         import torch.nn.functional as F
         from torch.utils.data.sampler import SubsetRandomSampler
         from torch.utils.data import DataLoader, ConcatDataset
+        print("DGL - torch library installed correctly.")
     except:
-        print("DGL - Error: Could not import torch")
+        raise Exception("DGL - Error: Could not import torch.")
+
 try:
     import dgl
     from dgl.data import DGLDataset
@@ -52,37 +60,54 @@ try:
     from dgl.nn import GINConv, GraphConv, SAGEConv, TAGConv
     from dgl import save_graphs, load_graphs
 except:
-    call = [sys.executable, '-m', 'pip', 'install', 'dgl', 'dglgo', '-f', 'https://data.dgl.ai/wheels/repo.html', '--upgrade', '-t', sys.path[0]]
-    subprocess.run(call)
+    print("DGL - Installing required dgl library.")
+    try:
+        os.system("pip install dgl -f https://data.dgl.ai/wheels/repo.html")
+        os.system("pip install dglgo -f https://data.dgl.ai/wheels-test/repo.html")
+    except:
+        os.system("pip install dgl -f https://data.dgl.ai/wheels/repo.html --user")
+        os.system("pip install dglgo -f https://data.dgl.ai/wheels-test/repo.html --user")
     try:
         import dgl
         from dgl.data import DGLDataset
-        from dgl.nn import GraphConv
+        from dgl.dataloading import GraphDataLoader
+        from dgl.nn import GINConv, GraphConv, SAGEConv, TAGConv
         from dgl import save_graphs, load_graphs
+        print("DGL - dgl library installed correctly.")
     except:
-        print("DGL - Error: Could not import dgl")
+        raise Exception("DGL - Error: Could not import dgl. The installation of the correct version of the dgl library is not trivial and is highly dependent on your hardward and software configuration. Please consult the dgl installation instructions.")
+
 try:
-    import sklearn
+    from sklearn import metrics
     from sklearn.model_selection import KFold
     from sklearn.metrics import accuracy_score
 except:
-    call = [sys.executable, '-m', 'pip', 'install', 'scikit-learn', '-t', sys.path[0]]
-    subprocess.run(call)
+    print("DGL - Installing required scikit-learn (sklearn) library.")
+    try:
+        os.system("pip install scikit-learn")
+    except:
+        os.system("pip install scikit-learn --user")
     try:
-        import sklearn
+        from sklearn import metrics
         from sklearn.model_selection import KFold
         from sklearn.metrics import accuracy_score
+        print("DGL - scikit-learn (sklearn) library installed correctly.")
     except:
-        print("DGL - Error: Could not import sklearn")
+        raise Exception("DGL - Error: Could not import scikit-learn (sklearn).")
+
 try:
     from tqdm.auto import tqdm
 except:
-    call = [sys.executable, '-m', 'pip', 'install', 'tqdm', '-t', sys.path[0]]
-    subprocess.run(call)
+    print("DGL - Installing required tqdm library.")
+    try:
+        os.system("pip install tqdm")
+    except:
+        os.system("pip install tqdm --user")
     try:
         from tqdm.auto import tqdm
+        print("DGL - tqdm library installed correctly.")
     except:
-        print("DGL - Error: Could not import tqdm")
+        raise Exception("DGL - Error: Could not import tqdm.")
 
 class _Dataset(DGLDataset):
     def __init__(self, graphs, labels, node_attr_key, edge_attr_key):
@@ -1431,8 +1456,6 @@ class DGL:
             The dictionary containing the performance measures. The keys in the dictionary are: 'mae', 'mape', 'mse', 'r', 'r2', 'rmse', .
         """
         
-        import numpy as np
-
         if not isinstance(actual, list):
             print("DGL.Performance - ERROR: The actual input is not a list. Returning None")
             return None
@@ -1683,8 +1706,7 @@ class DGL:
             The created confusion matrix.
 
         """
-        from sklearn import metrics
-        import numpy
+
         if not isinstance(actual, list):
             print("DGL.ConfusionMatrix - ERROR: The actual input is not a list. Returning None")
             return None

{topologicpy-0.4.62 → topologicpy-0.4.64}/src/topologicpy/EnergyModel.py

@@ -1,40 +1,43 @@
 import topologicpy
 import topologic
-from topologicpy.Topology import Topology
-from topologicpy.Dictionary import Dictionary
 
 import shutil
 import math
 from collections import OrderedDict
 import os
 from os.path import exists
-import json
 from datetime import datetime
-import time
-import sys
-import subprocess
+
+
 try:
     from tqdm.auto import tqdm
 except:
-    import sys, subprocess
-    call = [sys.executable, '-m', 'pip', 'install', 'tqdm', '-t', sys.path[0]]
-    subprocess.run(call)
+    print("EnergyModel - Installing required tqdm library.")
+    try:
+        os.system("pip install tqdm")
+    except:
+        os.system("pip install tqdm --user")
     try:
         from tqdm.auto import tqdm
+        print("EnergyModel - tqdm library installed correctly.")
     except:
-        print("EnergyModel - ERROR: Could not import tqdm")
+        raise Exception("EnergyModel - Error: Could not import tqdm.")
 
 try:
     import openstudio
     openstudio.Logger.instance().standardOutLogger().setLogLevel(openstudio.Fatal)
 except:
-    call = [sys.executable, '-m', 'pip', 'install', 'openstudio', '-t', sys.path[0]]
-    subprocess.run(call)
+    print("EnergyModel - Installing required openstudio library.")
+    try:
+        os.system("pip install openstudio")
+    except:
+        os.system("pip install openstudio --user")
     try:
         import openstudio
         openstudio.Logger.instance().standardOutLogger().setLogLevel(openstudio.Fatal)
+        print("EnergyModel - openstudio library installed correctly.")
     except:
-        print("EnergyModel - ERROR: Could not import openstudio")
+        raise Exception("EnergyModel - Error: Could not import openstudio.")
 
 class EnergyModel:
     '''

{topologicpy-0.4.62 → topologicpy-0.4.64}/src/topologicpy/Face.py

@@ -3,6 +3,21 @@ import topologic
 from topologicpy.Vector import Vector
 from topologicpy.Wire import Wire
 import math
+import os
+
+try:
+    import numpy as np
+except:
+    print("Face - Installing required numpy library.")
+    try:
+        os.system("pip install numpy")
+    except:
+        os.system("pip install numpy --user")
+    try:
+        import numpy as np
+        print("Face - numpy library installed correctly.")
+    except:
+        raise Exception("Face - Error: Could not import numpy.")
 
 class Face(topologic.Face):
     @staticmethod
@@ -1644,7 +1659,6 @@ class Face(topologic.Face):
 
     @staticmethod
     def RectangleByPlaneEquation(origin: topologic.Vertex = None, width: float = 1.0, length: float = 1.0, placement: str = "center", equation: dict = None, tolerance: float = 0.0001) -> topologic.Face:
-        import numpy as np
         from topologicpy.Vertex import Vertex
         # Extract coefficients of the plane equation
         a = equation['a']

{topologicpy-0.4.62 → topologicpy-0.4.64}/src/topologicpy/Graph.py

@@ -8,35 +8,77 @@ import random
 import time
 import sys
 import subprocess
+import os
+
 try:
-    from tqdm.auto import tqdm
+    import numpy as np
 except:
-    call = [sys.executable, '-m', 'pip', 'install', 'tqdm', '-t', sys.path[0]]
-    subprocess.run(call)
+    print("Graph - Installing required numpy library.")
     try:
-        from tqdm.auto import tqdm
+        os.system("pip install numpy")
     except:
-        print("Graph - Error: Could not import tqdm")
+        os.system("pip install numpy --user")
+    try:
+        import numpy as np
+        print("Graph - numpy library installed correctly.")
+    except:
+        raise Exception("Graph - Error: Could not import numpy.")
 
 try:
-    import numpy as np
+    import pandas as pd
 except:
-    call = [sys.executable, '-m', 'pip', 'install', 'numpy', '-t', sys.path[0]]
-    subprocess.run(call)
+    print("Graph - Installing required pandas library.")
     try:
-        import numpy as np
+        os.system("pip install pandas")
+    except:
+        os.system("pip install pandas --user")
+    try:
+        import pandas as pd
+        print("Graph - pandas library installed correctly.")
+    except:
+        raise Exception("Graph - Error: Could not import pandas.")
+
+try:
+    from tqdm.auto import tqdm
+except:
+    print("Graph - Installing required tqdm library.")
+    try:
+        os.system("pip install tqdm")
+    except:
+        os.system("pip install tqdm --user")
+    try:
+        from tqdm.auto import tqdm
+        print("Graph - tqdm library installed correctly.")
     except:
-        print("Graph - Error: Could not import numpy")
+        raise Exception("Graph - Error: Could not import tqdm.")
 
 try:
     from pyvis.network import Network
 except:
-    call = [sys.executable, '-m', 'pip', 'install', 'pyvis', '-t', sys.path[0]]
-    subprocess.run(call)
+    print("Graph - Installing required pyvis library.")
+    try:
+        os.system("pip install pyvis")
+    except:
+        os.system("pip install pyvis --user")
     try:
         from pyvis.network import Network
+        print("Graph - pyvis library installed correctly.")
+    except:
+        raise Exception("Graph - Error: Could not import pyvis")
+
+try:
+    import networkx as nx
+except:
+    print("Graph - Installing required networkx library.")
+    try:
+        os.system("pip install networkx")
+    except:
+        os.system("pip install networkx --user")
+    try:
+        import networkx as nx
+        print("Graph - networkx library installed correctly.")
     except:
-        print("Graph - Error: Could not import pyvis")
+        raise Exception("Graph - Error: Could not import networkx.")
 
 class _Tree:
     def __init__(self, node="", *children):
@@ -472,16 +514,6 @@ class Graph:
                         returnList[index] = returnList[index]+1
             return returnList
 
-        try:
-            from tqdm.auto import tqdm
-        except:
-            call = [sys.executable, '-m', 'pip', 'install', 'tqdm', '-t', sys.path[0]]
-            subprocess.run(call)
-            try:
-                from tqdm.auto import tqdm
-            except:
-                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.")
             return None
@@ -551,7 +583,7 @@ class Graph:
             The created graph.
         
         """
-        import pandas as pd
+
         # Read the adjacency matrix from CSV file using pandas
         adjacency_matrix_df = pd.read_csv(path, header=None)
         
@@ -682,7 +714,6 @@ class Graph:
         from topologicpy.Edge import Edge
         from topologicpy.Topology import Topology
         from topologicpy.Dictionary import Dictionary
-        import pandas as pd
         import os
         from os.path import exists, isdir
         import yaml
@@ -2791,18 +2822,6 @@ class Graph:
             The closeness centrality of the input list of vertices within the input graph. The values are in the range 0 to 1.
 
         """
-        import sys
-        import subprocess
-
-        try:
-            from tqdm.auto import tqdm
-        except:
-            call = [sys.executable, '-m', 'pip', 'install', 'tqdm', '-t', sys.path[0]]
-            subprocess.run(call)
-            try:
-                from tqdm.auto import tqdm
-            except:
-                print("DGL - Error: Could not import tqdm")
 
         if not isinstance(graph, topologic.Graph):
             print("Graph.ClosenessCentrality - Error: The input graph is not a valid graph. Returning None.")
@@ -3188,7 +3207,6 @@ class Graph:
         ----------
         path : str
             The desired path to the output folder where the graphs, edges, and nodes CSV files will be saved.
-        import pandas as pd
 
         Returns
         -------
@@ -3196,7 +3214,6 @@ class Graph:
             True if the graph has been successfully exported. False otherwise.
 
         """
-        import pandas as pd
         
         # Convert the adjacency matrix (nested list) to a DataFrame
         adjacency_matrix_df = pd.DataFrame(adjacencyMatrix)
@@ -3327,7 +3344,6 @@ class Graph:
         import os
         import math
         import random
-        import pandas as pd
         import os
         from os.path import exists
         
@@ -4517,16 +4533,6 @@ class Graph:
         if not isinstance(graph, topologic.Graph):
             print("Graph.NetworkXGraph - Error: The input graph is not a valid graph. Returning None.")
             return None
-        try:
-            import networkx as nx
-        except:
-            call = [sys.executable, '-m', 'pip', 'install', 'networkx', '-t', sys.path[0]]
-            subprocess.run(call)
-            try:
-                import networkx as nx
-            except:
-                print("Graph.NetworkXGraph - ERROR: Could not import networkx. Returning None.")
-                return None
 
         nxGraph = nx.Graph()
         vertices = Graph.Vertices(graph)
@@ -5009,7 +5015,7 @@ class Graph:
     @staticmethod
     def Show(graph, vertexColor="black", vertexSize=6, vertexLabelKey=None, vertexGroupKey=None, vertexGroups=[], showVertices=True, showVertexLegend=False, edgeColor="black", edgeWidth=1, edgeLabelKey=None, edgeGroupKey=None, edgeGroups=[], showEdges=True, showEdgeLegend=False, colorScale='viridis', renderer="notebook",
              width=950, height=500, xAxis=False, yAxis=False, zAxis=False, axisSize=1, backgroundColor='rgba(0,0,0,0)', marginLeft=0, marginRight=0, marginTop=20, marginBottom=0,
-             camera=None, target=None, up=None, tolerance=0.0001):
+             camera=[-1.25, -1.25, 1.25], center=[0, 0, 0], up=[0, 0, 1], projection="perspective", tolerance=0.0001):
         """
         Shows the graph using Plotly.
 
@@ -5088,11 +5094,14 @@ class Graph:
         marginBottom : int , optional
             The size in pixels of the bottom margin. The default value is 0.
         camera : list , optional
-            The desired location of the camera. The default is [0,0,0].
-        target : list , optional
-            The desired camera target. The default is [0,0,0].
+            The desired location of the camera). The default is [-1.25,-1.25,1.25].
+        center : list , optional
+            The desired center (camera target). The default is [0,0,0].
         up : list , optional
             The desired up vector. The default is [0,0,1].
+        projection : str , optional
+            The desired type of projection. The options are "orthographic" or "perspective". It is case insensitive. The default is "perspective"
+
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
         
@@ -5110,7 +5119,7 @@ class Graph:
         data= Plotly.DataByGraph(graph, vertexColor=vertexColor, vertexSize=vertexSize, vertexLabelKey=vertexLabelKey, vertexGroupKey=vertexGroupKey, vertexGroups=vertexGroups, showVertices=showVertices, showVertexLegend=showVertexLegend, edgeColor=edgeColor, edgeWidth=edgeWidth, edgeLabelKey=edgeLabelKey, edgeGroupKey=edgeGroupKey, edgeGroups=edgeGroups, showEdges=showEdges, showEdgeLegend=showEdgeLegend, colorScale=colorScale)
         fig = Plotly.FigureByData(data, width=width, height=height, xAxis=xAxis, yAxis=yAxis, zAxis=zAxis, axisSize=axisSize, backgroundColor=backgroundColor,
                                   marginLeft=marginLeft, marginRight=marginRight, marginTop=marginTop, marginBottom=marginBottom, tolerance=tolerance)
-        Plotly.Show(fig, renderer=renderer, camera=camera, target=target, up=up)
+        Plotly.Show(fig, renderer=renderer, camera=camera, center=center, up=up, projection=projection)
 
     @staticmethod
     def Size(graph):
@@ -5342,17 +5351,6 @@ class Graph:
         from topologicpy.Wire import Wire
         from topologicpy.Cluster import Cluster
         from topologicpy.Topology import Topology
-        import sys
-        import subprocess
-        try:
-            from tqdm.auto import tqdm
-        except:
-            call = [sys.executable, '-m', 'pip', 'install', 'tqdm', '-t', sys.path[0]]
-            subprocess.run(call)
-            try:
-                from tqdm.auto import tqdm
-            except:
-                print("Graph.VisibilityGraph - Error: Could not import tqdm")
         
         def addEdge(edge, edges, viewpointsA, viewpointsB, tolerance=0.0001):
             # Add edge to edges only if its end points are in vertices

{topologicpy-0.4.62 → topologicpy-0.4.64}/src/topologicpy/Helper.py

@@ -1,7 +1,22 @@
 import topologicpy
-import numpy as np
-import numpy.linalg as la
 import math
+import os
+
+try:
+    import numpy as np
+    import numpy.linalg as la
+except:
+    print("Helper - Installing required numpy library.")
+    try:
+        os.system("pip install numpy")
+    except:
+        os.system("pip install numpy --user")
+    try:
+        import numpy as np
+        import numpy.linalg as la
+        print("Helper - numpy library installed correctly.")
+    except:
+        raise Exception("Helper - Error: Could not import numpy.")
 
 class Helper:
     @staticmethod