topologicpy 0.7.47__py3-none-any.whl → 0.7.48__py3-none-any.whl

topologicpy/PyG.py

@@ -16,25 +16,104 @@
 
 import os
 import copy
-import numpy as np
-import pandas as pd
-import torch
-import torch.nn as nn
-import torch.nn.functional as F
-from torch_geometric.data import Data, Dataset
-from torch_geometric.loader import DataLoader
-from torch_geometric.nn import SAGEConv, global_mean_pool, global_max_pool, global_add_pool
-from torch.utils.data.sampler import SubsetRandomSampler
-from sklearn.model_selection import KFold
-from sklearn.metrics import accuracy_score
-from tqdm.auto import tqdm
+import warnings
 import gc
 
-import torch
-from torch.utils.data import Dataset
-
-import torch
-from torch.utils.data import Dataset
+try:
+    import numpy as np
+except:
+    print("PyG - Installing required numpy library.")
+    try:
+        os.system("pip install numpy")
+    except:
+        os.system("pip install numpy --user")
+    try:
+        import numpy as np
+        print("PyG - numpy library installed successfully.")
+    except:
+        warnings.warn("PyG - Error: Could not import numpy.")
+
+try:
+    import pandas as pd
+except:
+    print("PyG - Installing required pandas library.")
+    try:
+        os.system("pip install pandas")
+    except:
+        os.system("pip install pandas --user")
+    try:
+        import numpy as np
+        print("PyG - pandas library installed successfully.")
+    except:
+        warnings.warn("PyG - Error: Could not import pandas.")
+
+try:
+    from tqdm.auto import tqdm
+except:
+    print("PyG - Installing required tqdm library.")
+    try:
+        os.system("pip install tqdm")
+    except:
+        os.system("pip install tqdm --user")
+    try:
+        from tqdm.auto import tqdm
+        print("PyG - tqdm library installed correctly.")
+    except:
+        raise Exception("PyG - Error: Could not import tqdm.")
+
+try:
+    import torch
+    import torch.nn as nn
+    import torch.nn.functional as F
+    from torch.utils.data.sampler import SubsetRandomSampler
+except:
+    print("PyG - 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
+        print("PyG - torch library installed correctly.")
+    except:
+        warnings.warn("PyG - Error: Could not import torch.")
+
+try:
+    from torch_geometric.data import Data, Dataset
+    from torch_geometric.loader import DataLoader
+    from torch_geometric.nn import SAGEConv, global_mean_pool, global_max_pool, global_add_pool
+except:
+    print("PyG - Installing required torch_geometric library.")
+    try:
+        os.system("pip install torch_geometric")
+    except:
+        os.system("pip install torch_geometric --user")
+    try:
+        from torch_geometric.data import Data, Dataset
+        from torch_geometric.loader import DataLoader
+        from torch_geometric.nn import SAGEConv, global_mean_pool, global_max_pool, global_add_pool
+        print("PyG - torch_geometric library installed correctly.")
+    except:
+        warnings.warn("PyG - Error: Could not import torch.")
+
+try:
+    from sklearn.model_selection import KFold
+    from sklearn.metrics import accuracy_score
+except:
+    print("PyG - Installing required scikit-learn library.")
+    try:
+        os.system("pip install -U scikit-learn")
+    except:
+        os.system("pip install -U scikit-learn --user")
+    try:
+        from sklearn.model_selection import KFold
+        from sklearn.metrics import accuracy_score
+        print("PyG - scikit-learn library installed correctly.")
+    except:
+        warnings.warn("PyG - Error: Could not import scikit. Please install it manually.")
 
 class CustomGraphDataset(Dataset):
     def __init__(self, root=None, data_list=None, indices=None, node_level=False, graph_level=True, 

topologicpy/Shell.py

@@ -383,6 +383,7 @@ class Shell():
     def ByWires(wires: list, triangulate: bool = True, tolerance: float = 0.0001, silent: bool = False):
         """
         Creates a shell by lofting through the input wires
+        
         Parameters
         ----------
         wires : list

topologicpy/Sun.py

@@ -261,6 +261,7 @@ class Sun():
         float
             The altitude angle.
         """
+
         import os
         import warnings
         import math
@@ -399,6 +400,7 @@ class Sun():
         list
             The sun vector pointing from the location of the sun towards the origin.
         """
+        
         from topologicpy.Vector import Vector
         azimuth = Sun.Azimuth(latitude=latitude, longitude=longitude, date=date)
         altitude = Sun.Altitude(latitude=latitude, longitude=longitude, date=date)
@@ -758,14 +760,12 @@ class Sun():
         -------
         dict
             A dictionary of the sun diagram shapes. The keys in this dictionary are:
-            - 'date_paths': These are the sun paths (wire) for the winter solstice, equinox, and summer solstice
-            - 'hourly_paths': These are the figure-8 (wire) for the sun location on the same hour on each selected day of the year.
-            - 'shell': This is the total surface (shell) of the sun paths. This is included only if the shell option is set to True.
-            - 'compass': This is the compass (shell) on the ground. It is made of 36 sides and 10 rings. This is included only
-               if the compass option is set to True.
-            - 'center' : This is a cross-shape (wire) at the center of the diagram. This is included only if the compass option is set to True.
-            - 'ground' : This is a circle (face) on the ground. It is made of 36 sides. This is included only if
-               the compass option is set to False.
+            'date_paths': These are the sun paths (wire) for the winter solstice, equinox, and summer solstice
+            'hourly_paths': These are the figure-8 (wire) for the sun location on the same hour on each selected day of the year.
+            'shell': This is the total surface (shell) of the sun paths. This is included only if the shell option is set to True.
+            'compass': This is the compass (shell) on the ground. It is made of 36 sides and 10 rings. This is included only if the compass option is set to True.
+            'center' : This is a cross-shape (wire) at the center of the diagram. This is included only if the compass option is set to True.
+            'ground' : This is a circle (face) on the ground. It is made of 36 sides. This is included only if the compass option is set to False.
         """
 
         from datetime import datetime

topologicpy/Vertex.py

@@ -316,14 +316,14 @@ class Vertex():
         Returns the centroid of the input list of vertices.
 
         Parameters
-        -----------
+        ----------
         vertices : list
             The input list of vertices
         mantissa : int , optional
             The desired length of the mantissa. The default is 6.
 
-        Return
-        ----------
+        Returns
+        -------
         topologic_core.Vertex
             The computed centroid of the input list of vertices
         
@@ -350,16 +350,17 @@ class Vertex():
         Sorts the input list of vertices in a clockwise fashion. This method assumes that the vertices are on the XY plane. The Z coordinate is ignored.
 
         Parameters
-        -----------
+        ----------
         vertices : list
             The input list of vertices
 
-        Return
-        -----------
+        Returns
+        -------
         list
             The input list of vertices sorted in a counter clockwise fashion
         
         """
+        
         return list(reversed(Vertex.CounterClockwise2D(vertices)))
     
     @staticmethod
@@ -414,14 +415,14 @@ class Vertex():
         Sorts the input list of vertices in a counterclockwise fashion. This method assumes that the vertices are on the XY plane. The Z coordinate is ignored.
 
         Parameters
-        -----------
+        ----------
         vertices : list
             The input list of vertices
         mantissa : int , optional
             The desired length of the mantissa. The default is 6.
 
-        Return
-        -----------
+        Returns
+        -------
         list
             The input list of vertices sorted in a counter clockwise fashion
         
@@ -1133,16 +1134,16 @@ class Vertex():
         """
         Returns True if the input vertex is peripheral to the input topology. Returns False otherwise.
         A vertex is said to be peripheral to the input topology if:
-            01. Vertex: If it is internal to it (i.e. coincident with it).
-            02. Edge: If it is internal to its start or end vertices.
-            03. Manifold open wire: If it is internal to its start or end vertices.
-            04. Manifold closed wire: If it is internal to any of its vertices.
-            05. Non-manifold wire: If it is internal to any of its vertices that has a vertex degree of 1.
-            06. Face: If it is internal to any of its edges or vertices.
-            07. Shell: If it is internal to external boundary
-            08. Cell: If it is internal to any of its faces, edges, or vertices.
-            09. CellComplex: If it is peripheral to its external boundary.
-            10. Cluster: If it is peripheral to any of its free topologies. (See Cluster.FreeTopologies)
+        01. Vertex: If it is internal to it (i.e. coincident with it).
+        02. Edge: If it is internal to its start or end vertices.
+        03. Manifold open wire: If it is internal to its start or end vertices.
+        04. Manifold closed wire: If it is internal to any of its vertices.
+        05. Non-manifold wire: If it is internal to any of its vertices that has a vertex degree of 1.
+        06. Face: If it is internal to any of its edges or vertices.
+        07. Shell: If it is internal to external boundary
+        08. Cell: If it is internal to any of its faces, edges, or vertices.
+        09. CellComplex: If it is peripheral to its external boundary.
+        10. Cluster: If it is peripheral to any of its free topologies. (See Cluster.FreeTopologies)
 
         Parameters
         ----------
@@ -1393,10 +1394,10 @@ class Vertex():
         Returns a vertex with coordinates (0, 0, 0)
 
         Parameters
-        -----------
+        ----------
 
-        Return
-        -----------
+        Returns
+        -------
         topologic_core.Vertex
         """
         return Vertex.ByCoordinates(0, 0, 0)
@@ -1525,14 +1526,14 @@ class Vertex():
         Returns the equation of the average plane passing through a list of vertices.
 
         Parameters
-        -----------
+        ----------
         vertices : list
             The input list of vertices
         mantissa : int , optional
             The desired length of the mantissa. The default is 6.
 
-        Return
-        -----------
+        Returns
+        -------
         dict
             The dictionary containing the values of a, b, c, d for the plane equation in the form of ax+by+cz+d=0.
             The keys in the dictionary are ["a", "b", "c". "d"]
@@ -1576,7 +1577,7 @@ class Vertex():
         Creates a point (vertex) using the input parameters
 
         Parameters
-        -----------
+        ----------
         x : float , optional.
             The desired x coordinate. The default is 0.
         y : float , optional.
@@ -1584,8 +1585,8 @@ class Vertex():
         z : float , optional.
             The desired z coordinate. The default is 0.
 
-        Return
-        -----------
+        Returns
+        -------
         topologic_core.Vertex
         """
         

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.47'
+__version__ = '0.7.48'

{topologicpy-0.7.47.dist-info → topologicpy-0.7.48.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.7.47
+Version: 0.7.48
 Summary: An Advanced Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction.
 Author-email: Wassim Jabi <wassim.jabi@gmail.com>
 License: MIT License

{topologicpy-0.7.47.dist-info → topologicpy-0.7.48.dist-info}/RECORD

@@ -18,18 +18,18 @@ topologicpy/Matrix.py,sha256=umgR7An919-wGInXJ1wpqnoQ2jCPdyMe2rcWTZ16upk,8079
 topologicpy/Neo4j.py,sha256=YvtF7RYUMATEZ8iHwFwK_MOxEDyARby2DTI2CCK6-cI,19694
 topologicpy/Plotly.py,sha256=o0JWE51lViK-UJUpIpf2Yusk_vTX5hfNMyFXFinKSRg,106048
 topologicpy/Polyskel.py,sha256=EFsuh2EwQJGPLiFUjvtXmAwdX-A4r_DxP5hF7Qd3PaU,19829
-topologicpy/PyG.py,sha256=0yeECsMz-dqhhZSv52s_xPCO_3BcEXUK7z1YFDN9qoo,106987
-topologicpy/Shell.py,sha256=aKdWIAqmLKPyi80f2PtH3_1iMfQRW0Eklbqol9cOPWM,87601
+topologicpy/PyG.py,sha256=3U59QObO56EBwrvaplGeLZhbTao0gJCYhWm3oTpjFAE,109505
+topologicpy/Shell.py,sha256=joahFtpRQTWJpQOmi3qU4Xe0Sx2XXeayHlXTNx8CzMk,87610
 topologicpy/Speckle.py,sha256=rUS6PCaxIjEF5_fUruxvMH47FMKg-ohcoU0qAUb-yNM,14267
-topologicpy/Sun.py,sha256=InnKtX8eKwtAgcScuABH6yp0ljmWh5m_fDR4-n3jJMY,36869
+topologicpy/Sun.py,sha256=42tDWMYpwRG7Z2Qjtp94eRgBuqySq7k8TgNUZDK7QxQ,36837
 topologicpy/Topology.py,sha256=XyXMuw1jTFdHJbuYNub_ngr9mFHmKxejUR7fe6denlk,366314
 topologicpy/Vector.py,sha256=WQQUbwrg7VKImtxuBUi2i-FRiPT77WlrzLP05gdXKM8,33079
-topologicpy/Vertex.py,sha256=EQdVYHmW85_pZdHZB3N8pEi0GiadCCkF3z_oqohA7B0,71161
+topologicpy/Vertex.py,sha256=bLY60YWoMsgCgHk7F7k9F93Sq2FJ6AzUcTfJ83NZfHA,71107
 topologicpy/Wire.py,sha256=9EJE0Iq3nGz5X7Suy6xxjmuOpfV49By6WH98UAL_7m4,153532
 topologicpy/__init__.py,sha256=D7ky87CAQMiS2KE6YLvcTLkTgA2PY7rASe6Z23pjp9k,872
-topologicpy/version.py,sha256=dUV7gU4tNxCy2pDr--lKpOV5DarADBM2ESg5M5mYK6w,23
-topologicpy-0.7.47.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
-topologicpy-0.7.47.dist-info/METADATA,sha256=6U-VIKu7gA3coK8iB1LazrQeGV8Wkj-q5Fpf4B9ppM0,10918
-topologicpy-0.7.47.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-topologicpy-0.7.47.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.47.dist-info/RECORD,,
+topologicpy/version.py,sha256=KnNxq_i4jicb02oPjeBZ0NMhwUqEYyzXll92M-WRkOY,23
+topologicpy-0.7.48.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
+topologicpy-0.7.48.dist-info/METADATA,sha256=ilMxONif8tLQu-geXJO8L0155g2f77eMTW7Y8LrhvZE,10918
+topologicpy-0.7.48.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+topologicpy-0.7.48.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.48.dist-info/RECORD,,