topologicpy 0.5.7__py3-none-any.whl → 0.5.9__py3-none-any.whl

topologicpy/Color.py

@@ -35,7 +35,23 @@ class Color:
         list
             The color expressed as an [r, g, b] or an [r, g, b, a] list.
         """
-        import webcolors
+        import warnings
+        import os
+        try:
+            import webcolors
+        except:
+            print("Color.ByCSSNamedColor - Information: Installing required webcolors library.")
+            try:
+                os.system("pip install webcolors")
+            except:
+                os.system("pip install webcolors --user")
+            try:
+                import webcolors
+                print("Color.ByCSSNamedColor - Information: webcolors library installed correctly.")
+            except:
+                warnings.warn("Color.ByCSSNamedColor - Error: Could not import webcolors library. Please manually install webcolors. Returning None.")
+                return None
+
         if not alpha == None:
             if not 0.0 <= alpha <= 1.0:
                 print("Color.ByCSSNamedColor - Error: alpha is not within the valid range of 0 to 1. Returning None.")
@@ -262,9 +278,23 @@ class Color:
         str
             The CSS named color that most closely matches the input color.
         """
-
-        import webcolors
         import numbers
+        import warnings
+        import os
+        try:
+            import webcolors
+        except:
+            print("Color.CSSNamedColor - Information: Installing required webcolors library.")
+            try:
+                os.system("pip install webcolors")
+            except:
+                os.system("pip install webcolors --user")
+            try:
+                import webcolors
+                print("Color.CSSNamedColor - Information: webcolors library installed correctly.")
+            except:
+                warnings.warn("Color.CSSNamedColor - Error: Could not import webcolors library. Please manually install webcolors. Returning None.")
+                return None
 
         if not isinstance(color, list):
             print("Color.CSSNamedColor - Error: The input color parameter is not a valid list. Returning None.")

topologicpy/DGL.py

@@ -94,24 +94,6 @@ except:
     except:
         warnings.warn("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:
-    from sklearn import metrics
-    from sklearn.model_selection import KFold
-    from sklearn.metrics import accuracy_score
-except:
-    print("DGL - Installing required scikit-learn (sklearn) library.")
-    try:
-        os.system("pip install scikit-learn")
-    except:
-        os.system("pip install scikit-learn --user")
-    try:
-        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:
-        raise Exception("DGL - Error: Could not import scikit-learn (sklearn).")
-
 try:
     from tqdm.auto import tqdm
 except:
@@ -715,6 +697,20 @@ class _GraphRegressorKFold:
     
     
     def train(self):
+        try:
+            from sklearn.model_selection import KFold
+        except:
+            print("DGL - Installing required scikit-learn (sklearn) library.")
+            try:
+                os.system("pip install scikit-learn")
+            except:
+                os.system("pip install scikit-learn --user")
+            try:
+                from sklearn.model_selection import KFold
+                print("DGL - scikit-learn (sklearn) library installed correctly.")
+            except:
+                warnings.warn("DGL - Error: Could not import scikit-learn (sklearn). Please try to install scikit-learn manually. Returning None.")
+                return None
         device = torch.device("cpu")
 
         # The number of folds (This should come from the hparams)
@@ -904,6 +900,22 @@ class _GraphClassifierHoldout:
                                                     batch_size=hparams.batch_size,
                                                     drop_last=False)
     def train(self):
+
+        try:
+            from sklearn.metrics import accuracy_score
+        except:
+            print("DGL - Installing required scikit-learn (sklearn) library.")
+            try:
+                os.system("pip install scikit-learn")
+            except:
+                os.system("pip install scikit-learn --user")
+            try:
+                from sklearn.metrics import accuracy_score
+                print("DGL - scikit-learn (sklearn) library installed correctly.")
+            except:
+                warnings.warn("DGL - Error: Could not import scikit-learn (sklearn). Please try to install scikit-learn manually. Returning None.")
+                return None
+        
         #device = torch.device("cuda:0" if torch.cuda.is_available() else "cpu")
         device = torch.device("cpu")
         # Init the loss and accuracy reporting lists
@@ -951,6 +963,20 @@ class _GraphClassifierHoldout:
             self.validation_loss_list.append(self.validation_loss)
         
     def validate(self):
+        try:
+            from sklearn.metrics import accuracy_score
+        except:
+            print("DGL - Installing required scikit-learn (sklearn) library.")
+            try:
+                os.system("pip install scikit-learn")
+            except:
+                os.system("pip install scikit-learn --user")
+            try:
+                from sklearn.metrics import accuracy_score
+                print("DGL - scikit-learn (sklearn) library installed correctly.")
+            except:
+                warnings.warn("DGL - Error: Could not import scikit-learn (sklearn). Please try to install scikit-learn manually. Returning None.")
+                return None
         #device = torch.device("cuda:0" if torch.cuda.is_available() else "cpu")
         device = torch.device("cpu")
         temp_loss_list = []
@@ -969,6 +995,20 @@ class _GraphClassifierHoldout:
         self.validation_loss = np.mean(temp_loss_list).item()
     
     def test(self):
+        try:
+            from sklearn.metrics import accuracy_score
+        except:
+            print("DGL - Installing required scikit-learn (sklearn) library.")
+            try:
+                os.system("pip install scikit-learn")
+            except:
+                os.system("pip install scikit-learn --user")
+            try:
+                from sklearn.metrics import accuracy_score
+                print("DGL - scikit-learn (sklearn) library installed correctly.")
+            except:
+                warnings.warn("DGL - Error: Could not import scikit-learn (sklearn). Please try to install scikit-learn manually. Returning None.")
+                return None
         if self.test_dataloader:
             temp_loss_list = []
             temp_acc_list = []
@@ -1073,6 +1113,23 @@ class _GraphClassifierKFold:
                                             lr=self.hparams.lr, maximize=self.hparams.maximize, weight_decay=self.hparams.weight_decay)
 
     def train(self):
+
+        try:
+            from sklearn.model_selection import KFold
+            from sklearn.metrics import accuracy_score
+        except:
+            print("DGL - Installing required scikit-learn (sklearn) library.")
+            try:
+                os.system("pip install scikit-learn")
+            except:
+                os.system("pip install scikit-learn --user")
+            try:
+                from sklearn.model_selection import KFold
+                from sklearn.metrics import accuracy_score
+                print("DGL - scikit-learn (sklearn) library installed correctly.")
+            except:
+                warnings.warn("DGL - Error: Could not import scikit-learn (sklearn). Please try to install scikit-learn manually. Returning None.")
+                return None
         # The number of folds (This should come from the hparams)
         k_folds = self.hparams.k_folds
 
@@ -1176,6 +1233,20 @@ class _GraphClassifierKFold:
         self.validation_loss_list = self.validation_loss_list[ind]
         
     def validate(self):
+        try:
+            from sklearn.metrics import accuracy_score
+        except:
+            print("DGL - Installing required scikit-learn (sklearn) library.")
+            try:
+                os.system("pip install scikit-learn")
+            except:
+                os.system("pip install scikit-learn --user")
+            try:
+                from sklearn.metrics import accuracy_score
+                print("DGL - scikit-learn (sklearn) library installed correctly.")
+            except:
+                warnings.warn("DGL - Error: Could not import scikit-learn (sklearn). Please try to install scikit-learn manually. Returning None.")
+                return None
         temp_loss_list = []
         temp_acc_list = []
         self.model.eval()
@@ -1192,6 +1263,22 @@ class _GraphClassifierKFold:
         self.validation_loss = np.mean(temp_loss_list).item()
     
     def test(self):
+
+        try:
+            from sklearn.metrics import accuracy_score
+        except:
+            print("DGL - Installing required scikit-learn (sklearn) library.")
+            try:
+                os.system("pip install scikit-learn")
+            except:
+                os.system("pip install scikit-learn --user")
+            try:
+                from sklearn.metrics import accuracy_score
+                print("DGL - scikit-learn (sklearn) library installed correctly.")
+            except:
+                warnings.warn("DGL - Error: Could not import scikit-learn (sklearn). Please try to install scikit-learn manually. Returning None.")
+                return None
+        
         if self.testingDataset:
             self.test_dataloader = GraphDataLoader(self.testingDataset,
                                                     batch_size=len(self.testingDataset),
@@ -1724,6 +1811,23 @@ class DGL:
 
         """
 
+        try:
+            from sklearn import metrics
+            from sklearn.metrics import accuracy_score
+        except:
+            print("DGL - Installing required scikit-learn (sklearn) library.")
+            try:
+                os.system("pip install scikit-learn")
+            except:
+                os.system("pip install scikit-learn --user")
+            try:
+                from sklearn import metrics
+                from sklearn.metrics import accuracy_score
+                print("DGL - scikit-learn (sklearn) library installed correctly.")
+            except:
+                warnings.warn("DGL - Error: Could not import scikit-learn (sklearn). Please try to install scikit-learn manually. Returning None.")
+                return None
+            
         if not isinstance(actual, list):
             print("DGL.ConfusionMatrix - ERROR: The actual input is not a list. Returning None")
             return None

topologicpy/Dictionary.py

@@ -622,6 +622,9 @@ class Dictionary(topologic.Dictionary):
         if not isinstance(dictionary, topologic.Dictionary) and not isinstance(dictionary, dict):
             print("Dictionary.ValueAtKey - Error: The input dictionary parameter is not a valid topologic or python dictionary. Returning None.")
             return None
+        if not isinstance(key, str):
+            print("Dictionary.ValueAtKey - Error: The input key parameter is not a valid str. Returning None.")
+            return None
         if isinstance(dictionary, dict):
             attr = dictionary[key]
         elif isinstance(dictionary, topologic.Dictionary):

topologicpy/EnergyModel.py

@@ -37,22 +37,6 @@ except:
     except:
         warnings.warn("EnergyModel - Error: Could not import tqdm.")
 
-try:
-    import openstudio
-    openstudio.Logger.instance().standardOutLogger().setLogLevel(openstudio.Fatal)
-except:
-    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:
-        warnings.warn("EnergyModel - Error: Could not import openstudio.")
-
 class EnergyModel:
     '''
     @staticmethod
@@ -99,8 +83,25 @@ class EnergyModel:
             The OSM model.
 
         """
+        try:
+            import openstudio
+            openstudio.Logger.instance().standardOutLogger().setLogLevel(openstudio.Fatal)
+        except:
+            print("EnergyModel.ByOSMPath - Information: 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.ByOSMPath - Information: openstudio library installed correctly.")
+            except:
+                warnings.warn("EnergyModel - Error: Could not import openstudio.Please try to install openstudio manually. Returning None.")
+                return None
+        
         if not path:
-            print("EnergyModel.ByImportedOSM - Error: The input path is not valid. Returning None.")
+            print("EnergyModel.ByOSMPath - Error: The input path is not valid. Returning None.")
             return None
         translator = openstudio.osversion.VersionTranslator()
         osmPath = openstudio.openstudioutilitiescore.toPath(path)
@@ -111,26 +112,6 @@ class EnergyModel:
         else:
             osModel = osModel.get()
         return osModel
-
-    @staticmethod
-    def ByImportedOSM(path: str):
-        """
-        DEPRECATED. DO NOT USE. Instead use Topology.ByOSMPath or Topology.ByOSMFile
-        Creates an EnergyModel from the input OSM file path.
-        
-        Parameters
-        ----------
-        path : string
-            The path to the input .OSM file.
-
-        Returns
-        -------
-        openstudio.openstudiomodelcore.Model
-            The OSM model.
-
-        """
-        print("Topology.ByImportedOSM - WARNING: This method is DEPRECATED. DO NOT USE. Instead use Topology.ByOSMPath")
-        return EnergyModel.ByOSMPath(path=path)
     
     @staticmethod
     def ByTopology(building : topologic.Topology,

topologicpy/Face.py

@@ -1786,7 +1786,7 @@ class Face(Topology):
         return Face.ByWire(wire, tolerance=tolerance)
 
     @staticmethod
-    def Triangulate(face:topologic.Face, mode: str = "classic", meshSize: float = None, tolerance: float = 0.0001) -> list:
+    def Triangulate(face:topologic.Face, mode: int = 0, meshSize: float = None, tolerance: float = 0.0001) -> list:
         """
         Triangulates the input face and returns a list of faces.
 
@@ -1796,10 +1796,18 @@ class Face(Topology):
             The input face.
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
-        mode : str , optional
-            The desired mode of meshing. Two options are available: "classic" and "mesh". They are case insensitive.
-            The "mesh" option uses the gmsh library.
-            WARNING: The "mesh" option can be very time consuming and can create very heavy geometry.
+        mode : int , optional
+            The desired mode of meshing algorithm. Several options are available:
+            0: Classic
+            1: MeshAdapt
+            3: Initial Mesh Only
+            5: Delaunay
+            6: Frontal-Delaunay
+            7: BAMG
+            8: Fontal-Delaunay for Quads
+            9: Packing of Parallelograms
+            All options other than 0 (Classic) use the gmsh library. See https://gmsh.info/doc/texinfo/gmsh.html#Mesh-options
+            WARNING: The options that use gmsh can be very time consuming and can create very heavy geometry.
         meshSize : float , optional
             The desired size of the mesh when using the "mesh" option. If set to None, it will be
             calculated automatically and set to 10% of the overall size of the face.
@@ -1810,14 +1818,11 @@ class Face(Topology):
             The list of triangles of the input face.
 
         """
-        from topologicpy.Vertex import Vertex
         from topologicpy.Wire import Wire
-        from topologicpy.Shell import Shell
         from topologicpy.Topology import Topology
-        from topologicpy.Dictionary import Dictionary
 
         # This function was contributed by Yidan Xue.
-        def generate_gmsh(face, meshSize = None, tolerance = 0.0001):
+        def generate_gmsh(face, mode="mesh", meshSize = None, tolerance = 0.0001):
             """
             Creates a gmsh of triangular meshes from the input face.
 
@@ -1921,7 +1926,9 @@ class Face(Topology):
 
             gmsh.model.geo.addPlaneSurface([i+1 for i in range(current_wire_number)])
             gmsh.model.geo.synchronize()
-            
+            if mode not in [1,3,5,6,7,8,9]:
+                mode = 6
+            gmsh.option.setNumber("Mesh.Algorithm", mode)
             gmsh.model.mesh.generate(2)         # For a 2D mesh
             nodeTags, nodeCoords, nodeParams = gmsh.model.mesh.getNodes(-1, -1)
             elemTypes, elemTags, elemNodeTags = gmsh.model.mesh.getElements(-1, -1)
@@ -1955,9 +1962,7 @@ class Face(Topology):
         normal = Face.Normal(face)
         flatFace = Topology.Flatten(face, origin=origin, direction=normal)
 
-        if "mesh" in mode.lower():
-            shell_faces = generate_gmsh(flatFace, meshSize = meshSize, tolerance = tolerance)
-        else:
+        if mode == 0:
             shell_faces = []
             for i in range(0,5,1):
                 try:
@@ -1965,7 +1970,9 @@ class Face(Topology):
                     break
                 except:
                     continue
-        
+        else:
+            shell_faces = generate_gmsh(flatFace, mode = mode, meshSize = meshSize, tolerance = tolerance)
+            
         if len(shell_faces) < 1:
             return []
         finalFaces = []

topologicpy/Graph.py

@@ -66,33 +66,7 @@ except:
     except:
         warnings.warn("Graph - Error: Could not import tqdm.")
 
-try:
-    from pyvis.network import Network
-except:
-    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:
-        rwarnings.warn("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:
-        warnings.warn("Graph - Error: Could not import networkx.")
 
 class _Tree:
     def __init__(self, node="", *children):
@@ -643,7 +617,7 @@ class Graph:
             from rdflib import URIRef, Literal, Namespace
             from rdflib.namespace import RDF, RDFS
         except:
-            print("Graph.BOTGraph - Installing required rdflib library.")
+            print("Graph.BOTGraph - Information: Installing required rdflib library.")
             try:
                 os.system("pip install rdflib")
             except:
@@ -652,7 +626,7 @@ class Graph:
                 from rdflib import Graph as RDFGraph
                 from rdflib import URIRef, Literal, Namespace
                 from rdflib.namespace import RDF, RDFS
-                print("Graph.BOTGraph - rdflib library installed correctly.")
+                print("Graph.BOTGraph - Information: rdflib library installed correctly.")
             except:
                 warnings.warn("Graph.BOTGraph - Error: Could not import rdflib. Please try to install rdflib manually. Returning None.")
                 return None
@@ -1136,9 +1110,23 @@ class Graph:
         from topologicpy.Graph import Graph
         from topologicpy.Dictionary import Dictionary
         from topologicpy.Topology import Topology
-
-        import rdflib
         import random
+
+        try:
+            import rdflib
+        except:
+            print("Graph.BOTGraph - Information: Installing required rdflib library.")
+            try:
+                os.system("pip install rdflib")
+            except:
+                os.system("pip install rdflib --user")
+            try:
+                import rdflib
+                print("Graph.BOTGraph - Information: rdflib library installed correctly.")
+            except:
+                warnings.warn("Graph.BOTGraph - Error: Could not import rdflib. Please try to install rdflib manually. Returning None.")
+                return None
+        
         predicates = ['adjacentto', 'interfaceof', 'containselement', 'connectsto']
         bot_types = ['Space', 'Wall', 'Slab', 'Door', 'Window', 'Element']
 
@@ -1221,7 +1209,21 @@ class Graph:
                   tolerance = 0.0001
                   ):
         
-        from rdflib import Graph as RDFGraph
+        try:
+            from rdflib import Graph as RDFGraph
+        except:
+            print("Graph.ByBOTPath - Information: Installing required rdflib library.")
+            try:
+                os.system("pip install rdflib")
+            except:
+                os.system("pip install rdflib --user")
+            try:
+                from rdflib import Graph as RDFGraph
+                print("Graph.ByBOTPath - Information: rdflib library installed correctly.")
+            except:
+                warnings.warn("Graph.ByBOTPath - Error: Could not import rdflib. Please try to install rdflib manually. Returning None.")
+                return None
+        
         bot_graph = RDFGraph()
         bot_graph.parse(path)
         return Graph.ByBOTGraph(bot_graph,
@@ -1687,12 +1689,29 @@ class Graph:
         from topologicpy.Edge import Edge
         from topologicpy.Graph import Graph
         from topologicpy.Dictionary import Dictionary
-        import ifcopenshell
-        import ifcopenshell.util.placement
-        import ifcopenshell.util.element
-        import ifcopenshell.util.shape
-        import ifcopenshell.geom
-        import sys
+        try:
+            import ifcopenshell
+            import ifcopenshell.util.placement
+            import ifcopenshell.util.element
+            import ifcopenshell.util.shape
+            import ifcopenshell.geom
+        except:
+            print("Graph.ByIFCFile - Warning: Installing required ifcopenshell library.")
+            try:
+                os.system("pip install ifcopenshell")
+            except:
+                os.system("pip install ifcopenshell --user")
+            try:
+                import ifcopenshell
+                import ifcopenshell.util.placement
+                import ifcopenshell.util.element
+                import ifcopenshell.util.shape
+                import ifcopenshell.geom
+                print("Graph.ByIFCFile - Warning: ifcopenshell library installed correctly.")
+            except:
+                warnings.warn("Graph.ByIFCFile - Error: Could not import ifcopenshell. Please try to install ifcopenshell manually. Returning None.")
+                return None
+        
         import random
 
         def vertexAtKeyValue(vertices, key, value):
@@ -1892,7 +1911,28 @@ class Graph:
             The created graph.
         
         """
-        import ifcopenshell
+        try:
+            import ifcopenshell
+            import ifcopenshell.util.placement
+            import ifcopenshell.util.element
+            import ifcopenshell.util.shape
+            import ifcopenshell.geom
+        except:
+            print("Graph.ByIFCPath - Warning: Installing required ifcopenshell library.")
+            try:
+                os.system("pip install ifcopenshell")
+            except:
+                os.system("pip install ifcopenshell --user")
+            try:
+                import ifcopenshell
+                import ifcopenshell.util.placement
+                import ifcopenshell.util.element
+                import ifcopenshell.util.shape
+                import ifcopenshell.geom
+                print("Graph.ByIFCPath - Warning: ifcopenshell library installed correctly.")
+            except:
+                warnings.warn("Graph.ByIFCPath - Error: Could not import ifcopenshell. Please try to install ifcopenshell manually. Returning None.")
+                return None
         if not path:
             print("Graph.ByIFCPath - Error: the input path is not a valid path. Returning None.")
             return None
@@ -5779,7 +5819,7 @@ class Graph:
             print("Graph.IsBipartite - Error: The input graph is not a valid graph. Returning None.")
             return None
         order = Graph.Order(graph)
-        adjList = Graph.AdjacencyList(graph, tolerance)
+        adjList = Graph.AdjacencyList(graph, tolerance=tolerance)
         return isBipartite(order, adjList)
 
     @staticmethod
@@ -6620,12 +6660,24 @@ class Graph:
 
         """
         from topologicpy.Vertex import Vertex
-        from topologicpy.Edge import Edge
         from topologicpy.Topology import Topology
         from topologicpy.Dictionary import Dictionary
-        import random
-        import sys
-        import subprocess
+
+        try:
+            import networkx as nx
+        except:
+            print("Graph.NetworkXGraph - Information: Installing required networkx library.")
+            try:
+                os.system("pip install networkx")
+            except:
+                os.system("pip install networkx --user")
+            try:
+                import networkx as nx
+                print("Graph.NetworkXGraph - Infromation: networkx library installed correctly.")
+            except:
+                warnings.warn("Graph - Error: Could not import networkx. Please try to install networkx manually. Returning None.")
+                return None
+        
         if not isinstance(graph, topologic.Graph):
             print("Graph.NetworkXGraph - Error: The input graph is not a valid graph. Returning None.")
             return None
@@ -6931,6 +6983,22 @@ class Graph:
         from topologicpy.Dictionary import Dictionary
         from topologicpy.Color import Color
         from os.path import exists
+
+        try:
+            from pyvis.network import Network
+        except:
+            print("Graph.PyvisGraph - Information: 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.PyvisGraph - Information: pyvis library installed correctly.")
+            except:
+                warnings.warn("Graph - Error: Could not import pyvis. Please try to install pyvis manually. Retruning None.")
+                return None
+        
         net = Network(height=str(height)+"px", width="100%", bgcolor=backgroundColor, font_color=fontColor, select_menu=selectMenu, filter_menu=filterMenu, cdn_resources="remote", notebook=notebook)
         if notebook == True:
             net.prep_notebook()

topologicpy/Topology.py

@@ -44,22 +44,6 @@ except:
     except:
         warnings.warn("Topology - Error: Could not import numpy.")
 
-try:
-    import ifcopenshell
-    import ifcopenshell.geom
-except:
-    print("Topology - Installing required ifcopenshell library.")
-    try:
-        os.system("pip install ifcopenshell")
-    except:
-        os.system("pip install ifcopenshell --user")
-    try:
-        import ifcopenshell
-        import ifcopenshell.geom
-        print("Topology - ifcopenshell library installed successfully.")
-    except:
-        warnings.warn("Topology - Error: Could not import ifcopenshell.")
-
 try:
     from scipy.spatial import ConvexHull
 except:
@@ -74,6 +58,20 @@ except:
     except:
         warnings.warn("Topology - Error: Could not import scipy.")
 
+try:
+    from tqdm.auto import tqdm
+except:
+    print("Topology - Installing required tqdm library.")
+    try:
+        os.system("pip install tqdm")
+    except:
+        os.system("pip install tqdm --user")
+    try:
+        from tqdm.auto import tqdm
+        print("Topology - tqdm library installed correctly.")
+    except:
+        warnings.warn("Topology - Error: Could not import tqdm.")
+
 QueueItem = namedtuple('QueueItem', ['ID', 'sinkKeys', 'sinkValues'])
 SinkItem = namedtuple('SinkItem', ['ID', 'sink_str'])
 
@@ -1810,6 +1808,22 @@ class Topology():
         from topologicpy.Dictionary import Dictionary
         import uuid
         
+        try:
+            import ifcopenshell
+            import ifcopenshell.geom
+        except:
+            print("Topology.ByIFCFile - Warning: Installing required ifcopenshell library.")
+            try:
+                os.system("pip install ifcopenshell")
+            except:
+                os.system("pip install ifcopenshell --user")
+            try:
+                import ifcopenshell
+                import ifcopenshell.geom
+                print("Topology.ByIFCFile - Warning: ifcopenshell library installed correctly.")
+            except:
+                warnings.warn("Topology.ByIFCFile - Error: Could not import ifcopenshell. Please try to install ifcopenshell manually. Returning None.")
+                return None
         if not file:
             print("Topology.ByIFCFile - Error: the input file parameter is not a valid file. Returning None.")
             return None
@@ -3541,7 +3555,7 @@ class Topology():
         return False
 
     @staticmethod
-    def Fix(topology, topologyType: str ="CellComplex", tolerance: float = 0.0001):
+    def Fix(topology, topologyType: str = "CellComplex", tolerance: float = 0.0001):
         """
         Attempts to fix the input topology to matched the desired output type.
 
@@ -3951,7 +3965,7 @@ class Topology():
         return json_string
     
     @staticmethod
-    def OBJString(topology, transposeAxes=True, mantissa=6, tolerance=0.0001):
+    def OBJString(topology, transposeAxes: bool = True, mode: int = 0, meshSize: float = None, mantissa: int = 6, tolerance: float = 0.0001):
         """
         Returns the Wavefront string of the input topology. This is very experimental and outputs a simple solid topology.
 
@@ -3961,6 +3975,21 @@ class Topology():
             The input topology.
         transposeAxes : bool , optional
             If set to True the Z and Y coordinates are transposed so that Y points "up"
+        mode : int , optional
+            The desired mode of meshing algorithm. Several options are available:
+            0: Classic
+            1: MeshAdapt
+            3: Initial Mesh Only
+            5: Delaunay
+            6: Frontal-Delaunay
+            7: BAMG
+            8: Fontal-Delaunay for Quads
+            9: Packing of Parallelograms
+            All options other than 0 (Classic) use the gmsh library. See https://gmsh.info/doc/texinfo/gmsh.html#Mesh-options
+            WARNING: The options that use gmsh can be very time consuming and can create very heavy geometry.
+        meshSize : float , optional
+            The desired size of the mesh when using the "mesh" option. If set to None, it will be
+            calculated automatically and set to 10% of the overall size of the face.
         mantissa : int , optional
             The desired length of the mantissa. The default is 6.
         tolerance : float , optional
@@ -3983,7 +4012,7 @@ class Topology():
         lines = []
         version = Helper.Version()
         lines.append("# topologicpy "+version)
-        topology = Topology.Triangulate(topology, tolerance=tolerance)
+        topology = Topology.Triangulate(topology, mode=mode, meshSize=meshSize, tolerance=tolerance)
         d = Topology.Geometry(topology, mantissa=mantissa)
         vertices = d['vertices']
         faces = d['faces']
@@ -4005,7 +4034,7 @@ class Topology():
         return finalLines
     
     @staticmethod
-    def ExportToOBJ(topology, path, transposeAxes=True, overwrite=False):
+    def ExportToOBJ(topology, path, transposeAxes: bool = True, mode: int = 0, meshSize: float = None, overwrite: bool = False, mantissa: int = 6, tolerance: float = 0.0001):
         """
         Exports the input topology to a Wavefront OBJ file. This is very experimental and outputs a simple solid topology.
 
@@ -4016,7 +4045,26 @@ class Topology():
         path : str
             The input file path.
         transposeAxes : bool , optional
-            If set to True the Z and Y coordinates are transposed so that Y points "up" 
+            If set to True the Z and Y coordinates are transposed so that Y points "up"
+        mode : int , optional
+            The desired mode of meshing algorithm. Several options are available:
+            0: Classic
+            1: MeshAdapt
+            3: Initial Mesh Only
+            5: Delaunay
+            6: Frontal-Delaunay
+            7: BAMG
+            8: Fontal-Delaunay for Quads
+            9: Packing of Parallelograms
+            All options other than 0 (Classic) use the gmsh library. See https://gmsh.info/doc/texinfo/gmsh.html#Mesh-options
+            WARNING: The options that use gmsh can be very time consuming and can create very heavy geometry.
+        meshSize : float , optional
+            The desired size of the mesh when using the "mesh" option. If set to None, it will be
+            calculated automatically and set to 10% of the overall size of the face.
+        mantissa : int , optional
+            The desired length of the mantissa. The default is 6.
+        tolerance : float , optional
+            The desired tolerance. The default is 0.0001.
         overwrite : bool , optional
             If set to True the ouptut file will overwrite any pre-existing file. Otherwise, it won't. The default is False.
 
@@ -4040,7 +4088,7 @@ class Topology():
         if ext.lower() != ".obj":
             path = path+".obj"
         status = False
-        objString = Topology.OBJString(topology, transposeAxes=transposeAxes)
+        objString = Topology.OBJString(topology, transposeAxes=transposeAxes, mode=mode, meshSize=meshSize, mantissa=mantissa, tolerance=tolerance)
         with open(path, "w") as f:
             f.writelines(objString)
             f.close()
@@ -5175,7 +5223,7 @@ class Topology():
         return new_topology
 
     @staticmethod
-    def Rotate(topology, origin=None, axis: list = [0, 0, 1], angle: float = 0, angTolerance: float =0.001, tolerance: float =0.0001):
+    def Rotate(topology, origin=None, axis: list = [0, 0, 1], angle: float = 0, angTolerance: float = 0.001, tolerance: float = 0.0001):
         """
         Rotates the input topology
 
@@ -6771,7 +6819,7 @@ class Topology():
 
     
     @staticmethod
-    def Triangulate(topology, transferDictionaries: bool = False, mode: str ="classic", meshSize: float = None, tolerance: float = 0.0001):
+    def Triangulate(topology, transferDictionaries: bool = False, mode: int = 0, meshSize: float = None, tolerance: float = 0.0001):
         """
         Triangulates the input topology.
 
@@ -6781,9 +6829,18 @@ class Topology():
             The input topologgy.
         transferDictionaries : bool , optional
             If set to True, the dictionaries of the faces in the input topology will be transferred to the created triangular faces. The default is False.
-        mode : str , optional
-            The desired mode of meshing. Two options are available: "classic" and "mesh". They are case insensitive.
-            The "mesh" option uses the gmsh library.
+        mode : int , optional
+            The desired mode of meshing algorithm. Several options are available:
+            0: Classic
+            1: MeshAdapt
+            3: Initial Mesh Only
+            5: Delaunay
+            6: Frontal-Delaunay
+            7: BAMG
+            8: Fontal-Delaunay for Quads
+            9: Packing of Parallelograms
+            All options other than 0 (Classic) use the gmsh library. See https://gmsh.info/doc/texinfo/gmsh.html#Mesh-options
+            WARNING: The options that use gmsh can be very time consuming and can create very heavy geometry.
         meshSize : float , optional
             The desired size of the mesh when using the "mesh" option. If set to None, it will be
             calculated automatically and set to 10% of the overall size of the face.
@@ -6801,7 +6858,6 @@ class Topology():
         from topologicpy.Cell import Cell
         from topologicpy.CellComplex import CellComplex
         from topologicpy.Cluster import Cluster
-        from topologicpy.Dictionary import Dictionary
 
         if not isinstance(topology, topologic.Topology):
             print("Topology.Triangulate - Error: The input parameter is not a valid topology. Returning None.")
@@ -6813,13 +6869,16 @@ class Topology():
             temp_topologies = []
             cellComplexes = Topology.SubTopologies(topology, subTopologyType="cellcomplex") or []
             for cc in cellComplexes:
-                temp_topologies.append(Topology.Triangulate(cc, transferDictionaries=transferDictionaries, tolerance=tolerance))
+                temp_topologies.append(Topology.Triangulate(cc, transferDictionaries=transferDictionaries, mode=mode, meshSize=meshSize, tolerance=tolerance))
             cells = Cluster.FreeCells(topology, tolerance=tolerance) or []
             for c in cells:
-                temp_topologies.append(Topology.Triangulate(c, transferDictionaries=transferDictionaries, tolerance=tolerance))
+                temp_topologies.append(Topology.Triangulate(c, transferDictionaries=transferDictionaries, mode=mode, meshSize=meshSize, tolerance=tolerance))
             shells = Cluster.FreeShells(topology, tolerance=tolerance) or []
             for s in shells:
-                temp_topologies.append(Topology.Triangulate(s, transferDictionaries=transferDictionaries, tolerance=tolerance))
+                temp_topologies.append(Topology.Triangulate(s, transferDictionaries=transferDictionaries, mode=mode, meshSize=meshSize, tolerance=tolerance))
+            faces = Cluster.FreeFaces(topology, tolerance=tolerance) or []
+            for f in faces:
+                temp_topologies.append(Topology.Triangulate(f, transferDictionaries=transferDictionaries, mode=mode, meshSize=meshSize, tolerance=tolerance))
             if len(temp_topologies) > 0:
                 return Cluster.ByTopologies(temp_topologies)
             else:
@@ -6837,7 +6896,6 @@ class Topology():
                 if transferDictionaries:
                     selectors.append(Topology.SetDictionary(Face.Centroid(triFace), Topology.Dictionary(aFace)))
                 faceTriangles.append(triFace)
-        
         if t == 8 or t == 16: # Face or Shell
             return_topology = Shell.ByFaces(faceTriangles, tolerance=tolerance)
             if transferDictionaries and not return_topology == None:

topologicpy/__init__.py

@@ -18,7 +18,7 @@ import sys
 import os, re
 from sys import platform
 
-__version__ = '0.5.7'
+__version__ = '0.5.9'
 __version_info__ = tuple([ int(num) for num in __version__.split('.')])
 
 if platform == 'win32':

{topologicpy-0.5.7.dist-info → topologicpy-0.5.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.5.7
+Version: 0.5.9
 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,21 +13,11 @@ Requires-Python: <3.12,>=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: pandas
 Requires-Dist: tqdm
 Requires-Dist: plotly
-Requires-Dist: pyvis
 Requires-Dist: lark
-Requires-Dist: webcolors
-Requires-Dist: rdflib
 
 # topologicpy
 

{topologicpy-0.5.7.dist-info → topologicpy-0.5.9.dist-info}/RECORD

@@ -2,14 +2,14 @@ topologicpy/Aperture.py,sha256=vENYlFaM6Pu-xCJB1YsW1I1_u5yDj-A70aU3bo3lpFA,2819
 topologicpy/Cell.py,sha256=qA-53s0ZDKzjaasRSuXuK-a55pZMORGHCw3uJ83k1Is,98603
 topologicpy/CellComplex.py,sha256=en_cLuUIB1YkHdtUo3fkB3XTIfsA0YRqZTSPqG6qGLQ,47389
 topologicpy/Cluster.py,sha256=Lg6d6wQ-hbPu-YAsprJmjXki8PTFcTnRgHmk9gjx60k,54978
-topologicpy/Color.py,sha256=CDKCuQlX1LqBU4d8Xl_Lt_iOiEbCGIkVNFu_IGn_jUw,17094
+topologicpy/Color.py,sha256=AnbSF-_8c7Zp0NKmHF3ydFxYJFA6IaPxuPKhQkamPfg,18454
 topologicpy/Context.py,sha256=bgwslZSu8Ijuz3fusdhP6XcDnCdwGhtbI0-uhVjB36U,2977
-topologicpy/DGL.py,sha256=-FDDTANjQb4fBtLHI433_KPmmGlTEPE7boYybXkoPuI,138321
-topologicpy/Dictionary.py,sha256=3qPs9xHarKaDKUChDBm_xa2uaWz2H4LmpLL-qoSZAZA,26742
+topologicpy/DGL.py,sha256=mpHcfAL8hWGKQFODRv_Qr1KezAP4fmXMvItmgSyimrA,143369
+topologicpy/Dictionary.py,sha256=pvZL9N-pqyYGH6iODETvSd0nNOfHzxB6DkkgUTylZFs,26918
 topologicpy/Edge.py,sha256=ZWR2icdFd7dMe8v-RPLAvg1C29hFFsMDBDlp85hluQk,50261
-topologicpy/EnergyModel.py,sha256=VPWkMP2uhJORiVqEomb2Dlx5VgKcVUbqnZBZX1IpF_Y,51771
-topologicpy/Face.py,sha256=H1D232WC410G4IeZ7NJS0pmHS1ASnuTQaQqjV84-UlI,90509
-topologicpy/Graph.py,sha256=O9DCVz_BCbq4irgnTxbpZXigsCvRM25ASAI_NJfw96I,369263
+topologicpy/EnergyModel.py,sha256=SrUF1bShYJdryPcpi6rnECnqurXh09N7e4qCNkB9REc,51396
+topologicpy/Face.py,sha256=xcVn0QfhSrxriDlp7h9NurqNh40KSTSUFlMGKf5V5y8,90780
+topologicpy/Graph.py,sha256=OiPLS4kuOHGv2maCDwM6amhEmq_EI-qhYf8l673Bs6g,372759
 topologicpy/Grid.py,sha256=5Wi7nF6axNqhr4WrWk1c1fb7nftG02-BzxTYneeGr88,17389
 topologicpy/Helper.py,sha256=dsMU4BAt6zKsYG-YiT_OE4kX2rq3dtl3AqMMd35-6DA,18250
 topologicpy/Honeybee.py,sha256=p5OZi8tGPxUNH91_8peChEkYJdg5vpRyeqHVz8S9OS0,20356
@@ -19,11 +19,11 @@ topologicpy/Plotly.py,sha256=WfYMljK6drw98Q6DRCYCeCtu5X0bhVyIr_NxYea8oUE,94962
 topologicpy/Polyskel.py,sha256=86B92P50crA5OU1wJHYm-21aATkgc2rfkINJ0FwtIek,16465
 topologicpy/Shell.py,sha256=iB6xltLq9naiArVKfzHdAhv07kwQHOPYniHh944JHcM,76277
 topologicpy/Speckle.py,sha256=3148ucY8YUrlEsUA3nryKmQqz2zcS3OCtAcxcYpzKkk,14775
-topologicpy/Topology.py,sha256=WbQJbDx966YzbwujFoapnccRCkZvWUtQCP4GvS8gacQ,306191
+topologicpy/Topology.py,sha256=GYBlNEXP9pgZtzP6bVGr_u-ak5_93f29kqGXXUy4HVU,309634
 topologicpy/Vector.py,sha256=3GayjTGJDhg6yuchN86yHWUV9hTyu-kp_HaWuBXu6fc,30476
 topologicpy/Vertex.py,sha256=Te0RmdRQba1I21FcrAqlbJblUzJ07Xk44FKJiNtlgkw,66492
 topologicpy/Wire.py,sha256=bD8uhOzsH6_NWgDtGtW84PNKWscsVOpmbYul9k8ShfU,131871
-topologicpy/__init__.py,sha256=3MVv5RbIMKCWV9LjHyLLWvJM6BZhcuwCaWEL2ybFp08,1444
+topologicpy/__init__.py,sha256=46qRjTP5apsz37sasV3Q2WBe2Wi0BssqQCdFK0EhTFA,1444
 topologicpy/bin/linux/topologic/__init__.py,sha256=XlFReDf3FWlYdM9uXtanYPIafgPb6GVTQczS_xJAXD0,60
 topologicpy/bin/linux/topologic/libTKBO-6bdf205d.so.7.7.0,sha256=ANok9DQKcnWcLd9T_LAt-i-X4nsYYy16q9kQlcTre1E,2996488
 topologicpy/bin/linux/topologic/libTKBRep-2960a069.so.7.7.0,sha256=OJ3XesL79du8LeBHrsleGPXub6OpJdOilxha0mwjqQo,1378768
@@ -84,8 +84,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.5.7.dist-info/LICENSE,sha256=RUmXeeqj63bBySLJjEfhwb9OE7M8h9K6HuOBF3ASVyI,35697
-topologicpy-0.5.7.dist-info/METADATA,sha256=gJsCZtJVe9_g3-hTkbeQ1kCP40sms-4Nnehp63F0cQg,7306
-topologicpy-0.5.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-topologicpy-0.5.7.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.5.7.dist-info/RECORD,,
+topologicpy-0.5.9.dist-info/LICENSE,sha256=RUmXeeqj63bBySLJjEfhwb9OE7M8h9K6HuOBF3ASVyI,35697
+topologicpy-0.5.9.dist-info/METADATA,sha256=oXQy1lAyNEUFLJ3Owg8sWLoQi8X_mOBqlgmbp7NU-Lo,7044
+topologicpy-0.5.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+topologicpy-0.5.9.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.5.9.dist-info/RECORD,,