topologicpy 0.7.20__py3-none-any.whl → 0.7.22__py3-none-any.whl

topologicpy/ANN.py

@@ -480,6 +480,7 @@ class ANN():
             it controls the shuffling of the data before splitting it into training and testing sets.
             This means that every time you run your code with the same randomState value and the same dataset, you will get the same split of the data.
             The default is 42 which is just a randomly picked integer number. Specify None for random sampling.
+        
         Returns
         -------
         dict
@@ -517,7 +518,7 @@ class ANN():
         ----------
 
         Returns
-        ----------
+        -------
         list
             The list of names of available sample datasets
         """
@@ -805,7 +806,6 @@ class ANN():
             'training_r2' (R^2 for regression tasks only)
             'validation_r2' (R^2 for regression tasks only)
 
-
         """
 
         return {
@@ -1126,8 +1126,5 @@ class ANN():
             print("ANN.Load - Error: The specified path does not exist. Returning None.")
             return None
         model.load(path)
-        return model
-
-
-    
+        return model 
     

topologicpy/Cell.py

@@ -298,7 +298,7 @@ class Cell():
             bottomFace = face
             topFace = Topology.Translate(face, faceNormal[0]*thickness, faceNormal[1]*thickness, faceNormal[2]*thickness)
 
-        cellFaces = [bottomFace, topFace]
+        cellFaces = [Face.Invert(bottomFace), topFace]
         bottomEdges = Topology.Edges(bottomFace)
         for bottomEdge in bottomEdges:
             topEdge = Topology.Translate(bottomEdge, faceNormal[0]*thickness, faceNormal[1]*thickness, faceNormal[2]*thickness)
@@ -988,8 +988,6 @@ class Cell():
     def Dodecahedron(origin= None, radius: float = 0.5,
                   direction: list = [0, 0, 1], placement: str ="center", tolerance: float = 0.0001):
         """
-        Description
-        ----------
         Creates a dodecahedron. See https://en.wikipedia.org/wiki/Dodecahedron.
 
         Parameters
@@ -1331,8 +1329,6 @@ class Cell():
     def Icosahedron(origin= None, radius: float = 0.5,
                   direction: list = [0, 0, 1], placement: str ="center", tolerance: float = 0.0001):
         """
-        Description
-        ----------
         Creates an icosahedron. See https://en.wikipedia.org/wiki/Icosahedron.
 
         Parameters
@@ -1412,7 +1408,6 @@ class Cell():
         icosahedron = Topology.Place(icosahedron, originA=Vertex.Origin(), originB=origin)
         return icosahedron
 
-
     @staticmethod
     def InternalBoundaries(cell) -> list:
         """
@@ -1500,8 +1495,6 @@ class Cell():
     def Octahedron(origin= None, radius: float = 0.5,
                   direction: list = [0, 0, 1], placement: str ="center", tolerance: float = 0.0001):
         """
-        Description
-        ----------
         Creates an octahedron. See https://en.wikipedia.org/wiki/Octahedron.
 
         Parameters
@@ -1562,8 +1555,6 @@ class Cell():
     @staticmethod
     def Pipe(edge, profile = None, radius: float = 0.5, sides: int = 16, startOffset: float = 0, endOffset: float = 0, endcapA = None, endcapB = None, mantissa: int = 6) -> dict:
         """
-        Description
-        ----------
         Creates a pipe along the input edge.
 
         Parameters
@@ -1696,8 +1687,6 @@ class Cell():
     def Prism(origin= None, width: float = 1, length: float = 1, height: float = 1, uSides: int = 1, vSides: int = 1, wSides: int = 1,
                   direction: list = [0, 0, 1], placement: str ="center", mantissa: int = 6, tolerance: float = 0.0001):
         """
-        Description
-        ----------
         Creates a prism.
 
         Parameters
@@ -1847,9 +1836,12 @@ class Cell():
         from topologicpy.Topology import Topology
         
         shell = Shell.Roof(face=face, angle=angle, epsilon=epsilon, tolerance=tolerance)
+        if not Topology.IsInstance(shell, "Shell"):
+            print("Cell.Roof - Error: Could not create a roof cell. Returning None.")
+            return None
         faces = Topology.Faces(shell) + [face]
         cell = Cell.ByFaces(faces, tolerance=tolerance)
-        if not cell:
+        if not Topology.IsInstance(cell, "Cell"):
             print("Cell.Roof - Error: Could not create a roof cell. Returning None.")
             return None
         return cell
@@ -2017,8 +2009,6 @@ class Cell():
     def Tetrahedron(origin= None, radius: float = 0.5,
                   direction: list = [0, 0, 1], placement: str ="center", tolerance: float = 0.0001):
         """
-        Description
-        ----------
         Creates a tetrahedron. See https://en.wikipedia.org/wiki/Tetrahedron.
 
         Parameters

topologicpy/CellComplex.py

@@ -790,8 +790,6 @@ class CellComplex():
     def Octahedron(origin= None, radius: float = 0.5,
                   direction: list = [0, 0, 1], placement: str ="center", tolerance: float = 0.0001):
         """
-        Description
-        ----------
         Creates an octahedron. See https://en.wikipedia.org/wiki/Octahedron.
 
         Parameters

topologicpy/Cluster.py

@@ -253,7 +253,6 @@ class Cluster():
         _ = cluster.Cells(None, cells)
         return cells
 
-
     @staticmethod
     def DBSCAN(topologies, selectors=None, keys=["x", "y", "z"], epsilon: float = 0.5, minSamples: int = 2):
         """
@@ -878,7 +877,6 @@ class Cluster():
         from topologicpy.Dictionary import Dictionary
         from topologicpy.Topology import Topology
 
-
         def k_means(data, vertices, k=4, maxIterations=100):
             import random
             def euclidean_distance(p, q):
@@ -914,8 +912,6 @@ class Cluster():
 
             return {'clusters': clusters, 'clusters_v': clusters_v, 'centroids': centroids}
 
-
-
         if not isinstance(topologies, list):
             print("Cluster.K_Means - Error: The input topologies parameter is not a valid list. Returning None.")
             return None

topologicpy/DGL.py

@@ -426,7 +426,6 @@ class _TAGConv(nn.Module):
         # h will now be vector of dimension num_classes
         return h
 
-
 class _GraphConvReg(nn.Module):
     def __init__(self, in_feats, h_feats, pooling):
         super(_GraphConvReg, self).__init__()
@@ -467,7 +466,6 @@ class _GraphConvReg(nn.Module):
         # h will now be vector of dimension num_classes
         return h
 
-
 class _GraphRegressorHoldout:
     def __init__(self, hparams, trainingDataset, validationDataset=None, testingDataset=None):
         #device = torch.device("cuda:0" if torch.cuda.is_available() else "cpu")
@@ -574,7 +572,6 @@ class _GraphRegressorHoldout:
             self.validate()
             self.validation_loss_list.append(torch.sqrt(self.validation_loss).item())
 
-
     def validate(self):
         device = torch.device("cpu")
         self.model.eval()
@@ -772,7 +769,6 @@ class _GraphRegressorKFold:
                     # Perform optimization
                     self.optimizer.step()
 
-
                 epoch_training_loss_list.append(torch.sqrt(loss).item())
                 self.validate()
                 epoch_validation_loss_list.append(torch.sqrt(self.validation_loss).item())
@@ -1306,7 +1302,6 @@ class _GraphClassifierKFold:
                 path = path+".pt"
             torch.save(self.model, path)
 
-
 class GCN_NC(nn.Module):
     def __init__(self, in_feats, h_feats, num_classes):
         super(GCN_NC, self).__init__()
@@ -1472,7 +1467,6 @@ class _NodeClassifier:
                 path = path+".pt"
             torch.save(self.model, path)
 
-
 class DGL:
     @staticmethod
     def Accuracy(actual, predicted, mantissa: int = 6):
@@ -2295,6 +2289,7 @@ class DGL:
             A list of length 3 containing the fraction to use for training, validation and test. If None, we will use [0.8, 0.1, 0.1]. The default is [0.8, 0.1, 0.1]
         randomState :  int or array_like , optional
             Random seed used to initialize the pseudo-random number generator. Can be any integer between 0 and 2**32 - 1 inclusive, an array (or other sequence) of such integers, or None (the default). If seed is None, then RandomState will try to read data from /dev/urandom (or the Windows analogue) if available or seed from the clock otherwise.
+        
         Returns
         -------
         dict
@@ -2805,7 +2800,6 @@ class DGL:
             'Losses' (Regressor and K-fold only)
             'min Loss' (Regressor and K-fold only)
 
-
         """
         from topologicpy.Helper import Helper
         
@@ -3026,8 +3020,6 @@ class DGL:
 
         return round(total_true_positives / (total_true_positives + total_false_negatives), mantissa)
 
-
-
     '''
     @staticmethod
     def TrainRegressor(hparams, trainingDataset, validationDataset=None, testingDataset=None, overwrite=False):

topologicpy/Dictionary.py

@@ -153,14 +153,14 @@ class Dictionary():
         return topologic.Dictionary.ByKeysValues(stl_keys, stl_values) # Hook to Core
     
     @staticmethod
-    def ByMergedDictionaries(dictionaries):
+    def ByMergedDictionaries(*dictionaries):
         """
         Creates a dictionary by merging the list of input dictionaries.
 
         Parameters
         ----------
-        dictionaries : list
-            The input list of dictionaries to be merges.
+        dictionaries : list or comma separated dictionaries
+            The input list of dictionaries to be merged.
 
         Returns
         -------
@@ -169,23 +169,35 @@ class Dictionary():
 
         """
         from topologicpy.Topology import Topology
-        if not isinstance(dictionaries, list):
+        from topologicpy.Helper import Helper
+
+        if isinstance(dictionaries, tuple):
+            dictionaries = Helper.Flatten(list(dictionaries))
+        if isinstance(dictionaries, list):
+            new_dictionaries = [d for d in dictionaries if Topology.IsInstance(d, "Dictionary")]
+        if len(new_dictionaries) == 0:
+            print("Dictionary.ByMergedDictionaries - Error: the input dictionaries parameter does not contain any valid dictionaries. Returning None.")
+            return None
+        if len(new_dictionaries) == 1:
+            print("Dictionary.ByMergedDictionaries - Error: the input dictionaries parameter contains only one dictionary. Returning input dictionary.")
+            return new_dictionaries[0]
+        if not isinstance(new_dictionaries, list):
             print("Dictionary.ByMergedDictionaries - Error: The input dictionaries parameter is not a valid list. Returning None.")
             return None
-        new_dictionaries = []
-        for d in dictionaries:
+        return_dictionaries = []
+        for d in new_dictionaries:
             if Topology.IsInstance(d, "Dictionary"):
-                new_dictionaries.append(d)
+                return_dictionaries.append(d)
             elif isinstance(d, dict):
-                new_dictionaries.append(Dictionary.ByPythonDictionary(d))
-        if len(new_dictionaries) == 0:
+                return_dictionaries.append(Dictionary.ByPythonDictionary(d))
+        if len(return_dictionaries) == 0:
             print("Dictionary.ByMergedDictionaries - Error: The input dictionaries parameter does not contain valid dictionaries. Returning None.")
             return None
-        elif len(new_dictionaries) == 1:
+        elif len(return_dictionaries) == 1:
             print("Dictionary.ByMergedDictionaries - Warning: The input dictionaries parameter contains only one valid dictionary. Returning that dictionary.")
             return new_dictionaries[0]
         else:
-            dictionaries = new_dictionaries
+            dictionaries = return_dictionaries
         sinkKeys = []
         sinkValues = []
         d = dictionaries[0]
@@ -669,8 +681,6 @@ class Dictionary():
         elif Topology.IsInstance(dictionary, "Dictionary"):
             keys = dictionary.Keys()
         returnList = []
-        if not keys:
-            return None
         for key in keys:
             try:
                 if isinstance(dictionary, dict):
@@ -680,6 +690,7 @@ class Dictionary():
                 else:
                     attr = None
             except:
+                print(f"Dictionary.Values - Error: Encountered an error in a key in the dictionary ({key}). Returning None.")
                 return None
             returnList.append(attr)
         return returnList

topologicpy/Edge.py

@@ -85,12 +85,8 @@ class Edge():
 
         """
         from topologicpy.Vertex import Vertex
-        from topologicpy.Wire import Wire
-        from topologicpy.Cluster import Cluster
         from topologicpy.Topology import Topology
         from topologicpy.Vector import Vector
-        import numpy as np
-
 
         def process_edges(edge1, edge2, tolerance=0.0001):
             start1 = Edge.StartVertex(edge1)
@@ -222,7 +218,6 @@ class Edge():
         edge = Topology.Translate(edge, n[0], n[1], n[2])
         return edge
 
-
     @staticmethod
     def ByStartVertexEndVertex(vertexA, vertexB, tolerance: float = 0.0001, silent=False):
         """
@@ -988,7 +983,6 @@ class Edge():
 
             return normal_vector
 
-
         def calculate_normal_line(start_vertex, end_vertex):
             # Calculate the normal vector of the line
             normal_vector = calculate_normal(start_vertex, end_vertex)

topologicpy/Face.py

@@ -677,7 +677,6 @@ class Face():
             face = None
         return face
 
-
     @staticmethod
     def ByWiresCluster(externalBoundary, internalBoundariesCluster = None, tolerance: float = 0.0001, silent: bool = False):
         """
@@ -770,7 +769,7 @@ class Face():
         elif placement.lower() == "upperright":
             arrow = Topology.Translate(arrow, -radius, -radius, 0)
         arrow = Topology.Place(arrow, originA=Vertex.Origin(), originB=origin)
-        arrow = Topology.Orient(arrow, origin=origin, direction=direction)
+        arrow = Topology.Orient(arrow, origin=origin, dirA=[0,0,1], dirB=direction)
         return arrow
 
     @staticmethod
@@ -925,7 +924,7 @@ class Face():
             The desired tolerance. The default is 0.0001.
         
         Returns
-        --------
+        -------
             topologic_core.Face
                 The created Einstein tile.
 
@@ -937,7 +936,9 @@ class Face():
         if not Topology.IsInstance(wire, "Wire"):
             print("Face.Einstein - Error: Could not create base wire for the Einstein tile. Returning None.")
             return None
-        return Face.ByWire(wire, tolerance=tolerance)
+        f = Face.ByWire(wire, tolerance=tolerance)
+        f = Topology.Orient(f, dirA=Face.Normal(f), dirB=direction)
+        return f
     
     @staticmethod
     def Ellipse(origin= None, inputMode: int = 1, width: float = 2.0, length: float = 1.0, focalLength: float = 0.866025, eccentricity: float = 0.866025, majorAxisLength: float = 1.0, minorAxisLength: float = 0.5, sides: float = 32, fromAngle: float = 0.0, toAngle: float = 360.0, close: bool = True, direction: list = [0, 0, 1], placement: str = "center", tolerance: float = 0.0001):
@@ -1060,10 +1061,6 @@ class Face():
         from topologicpy.Topology import Topology
 
         eb = face.ExternalBoundary()
-        f_dir = Face.Normal(face)
-        w_dir = Wire.Normal(eb)
-        if Vector.IsAntiParallel(f_dir, w_dir):
-            eb = Wire.Reverse(eb)
         return eb
     
     @staticmethod
@@ -1106,7 +1103,6 @@ class Face():
             return False
         return True
 
-
     @staticmethod
     def Fillet(face, radius: float = 0, radiusKey: str = None, tolerance: float = 0.0001, silent: bool = False):
         """
@@ -1707,7 +1703,11 @@ class Face():
             print("Face.Normal - Error: The input face parameter is not a valid face. Returning None.")
             return None
         
-        vertices = Topology.Vertices(face)
+        #vertices = Topology.Vertices(face)
+        v1 = Face.VertexByParameters(face, u=0, v=0)
+        v2 = Face.VertexByParameters(face, u=1, v=0)
+        v3 = Face.VertexByParameters(face, u=1, v=1)
+        vertices = [v1, v2, v3]
         vertices = [Vertex.Coordinates(v, mantissa=mantissa) for v in vertices]
         
         if len(vertices) < 3:
@@ -1996,20 +1996,20 @@ class Face():
     @staticmethod
     def Simplify(face, tolerance=0.0001):
         """
-            Simplifies the input face edges based on the Douglas Peucker algorthim. See https://en.wikipedia.org/wiki/Ramer%E2%80%93Douglas%E2%80%93Peucker_algorithm
-            Part of this code was contributed by gaoxipeng. See https://github.com/wassimj/topologicpy/issues/35
-            
-            Parameters
-            ----------
-            face : topologic_core.Face
-                The input face.
-            tolerance : float , optional
-                The desired tolerance. The default is 0.0001. Edges shorter than this length will be removed.
+        Simplifies the input face edges based on the Douglas Peucker algorthim. See https://en.wikipedia.org/wiki/Ramer%E2%80%93Douglas%E2%80%93Peucker_algorithm
+        Part of this code was contributed by gaoxipeng. See https://github.com/wassimj/topologicpy/issues/35
+        
+        Parameters
+        ----------
+        face : topologic_core.Face
+            The input face.
+        tolerance : float , optional
+            The desired tolerance. The default is 0.0001. Edges shorter than this length will be removed.
 
-            Returns
-            -------
-            topologic_core.Face
-                The simplified face.
+        Returns
+        -------
+        topologic_core.Face
+            The simplified face.
         """
         from topologicpy.Wire import Wire
         from topologicpy.Topology import Topology
@@ -2232,6 +2232,7 @@ class Face():
             The list of triangles of the input face.
 
         """
+        from topologicpy.Vector import Vector
         from topologicpy.Wire import Wire
         from topologicpy.Topology import Topology
 
@@ -2250,7 +2251,7 @@ class Face():
                 The desired tolerance. The default is 0.0001.
             
             Returns
-            ----------
+            -------
             topologic_core.Shell
                 The shell of triangular meshes.
 
@@ -2285,7 +2286,7 @@ class Face():
                 except:
                     warnings.warn("Face.Triangulate - Error: Could not import gmsh. Please try to install gmsh manually. Returning None.")
                     return None
-
+            
             from topologicpy.Vertex import Vertex
             from topologicpy.Wire import Wire
             from topologicpy.Face import Face
@@ -2398,7 +2399,15 @@ class Face():
                 finalFaces.append(f)
             else:
                 finalFaces.append(f)
-        return finalFaces
+        face_normal = Face.Normal(face)
+        return_faces = []
+        for ff in finalFaces:
+            normal = Face.Normal(ff)
+            if abs(Vector.Angle(normal, face_normal)) > 2:
+                return_faces.append(Face.Invert(ff))
+            else:
+                return_faces.append(ff)
+        return return_faces
 
     @staticmethod
     def TrimByWire(face, wire, reverse: bool = False):

topologicpy/Graph.py

@@ -65,7 +65,6 @@ except:
     except:
         warnings.warn("Graph - Error: Could not import tqdm.")
 
-
 GraphQueueItem = namedtuple('GraphQueueItem', ['edges'])
 
 class WorkerProcessPool(object):
@@ -119,7 +118,6 @@ class WorkerProcessPool(object):
         for p in self.process_list:
             p.join()
 
-
 class WorkerProcess(Process):
     """
     Creates a 2D navigation graph from a subset of sources and the list of destinations.
@@ -170,7 +168,6 @@ class WorkerProcess(Process):
             edges_str = [Topology.BREPString(s) for s in edges]
             self.message_queue.put(GraphQueueItem(edges_str))
 
-
 class MergingProcess(Process):
     """
     Receive message from other processes and merging the result
@@ -191,7 +188,6 @@ class MergingProcess(Process):
             except Exception as e:
                 print(str(e))
 
-
 class _Tree:
     def __init__(self, node="", *children):
         self.node = node
@@ -221,7 +217,6 @@ class _Tree:
     def __len__(self):
         return len(self.children)
 
-
 class _DrawTree(object):
     def __init__(self, tree, parent=None, depth=0, number=1):
         self.x = -1.0
@@ -1468,7 +1463,6 @@ class Graph:
             predicates += ['hasspace', 'hasbuilding', 'hasstorey']
             bot_types += ['Site', 'Building', 'Storey']
 
-
         namespaces = botGraph.namespaces()
 
         for ns in namespaces:
@@ -1981,7 +1975,6 @@ class Graph:
             graphs.append(Graph.ByVerticesEdges(vertices, edges))
         return {'graphs':graphs, 'labels':labels}
 
-
     @staticmethod
     def ByIFCFile(file, includeTypes: list = [], excludeTypes: list = [],
                   includeRels: list = [], excludeRels: list = [],
@@ -2284,7 +2277,6 @@ class Graph:
             return None
         return Graph.ByIFCFile(ifc_file, includeTypes=includeTypes, excludeTypes=excludeTypes, includeRels=includeRels, excludeRels=excludeRels, xMin=xMin, yMin=yMin, zMin=zMin, xMax=xMax, yMax=yMax, zMax=zMax)
 
-
     @staticmethod
     def ByMeshData(vertices, edges, vertexDictionaries=None, edgeDictionaries=None, tolerance=0.0001):
         """
@@ -2620,7 +2612,6 @@ class Graph:
                     _ = tempe.SetDictionary(tempd)
                     edges.append(tempe)
 
-
             cells = []
             _ = topology.Cells(None, cells)
             if any([viaSharedTopologies, viaSharedApertures, toExteriorTopologies, toExteriorApertures, toContents]):
@@ -4999,7 +4990,6 @@ class Graph:
         
         """
 
-
         from topologicpy.Vertex import Vertex
         from topologicpy.Edge import Edge
         from topologicpy.Helper import Helper
@@ -5735,7 +5725,6 @@ class Graph:
 
                 midpoint = (v.children[0].x + v.children[-1].x) / 2
 
-
                 w = v.lbrother()
                 if w:
                     v.x = w.x + distance
@@ -5778,7 +5767,6 @@ class Graph:
                     default_ancestor = v
             return default_ancestor
 
-
         def move_subtree(wl, wr, shift):
             subtrees = wr.number - wl.number
             wr.change -= shift / subtrees
@@ -5787,7 +5775,6 @@ class Graph:
             wr.x += shift
             wr.mod += shift
 
-
         def execute_shifts(v):
             shift = change = 0
             for w in v.children[::-1]:
@@ -5796,14 +5783,12 @@ class Graph:
                 change += w.change
                 shift += w.shift + change
 
-
         def ancestor(vil, v, default_ancestor):
             if vil.ancestor in v.parent.children:
                 return vil.ancestor
             else:
                 return default_ancestor
 
-
         def second_walk(v, m=0, depth=0, min=None):
             v.x += m
             v.y = depth
@@ -5816,7 +5801,6 @@ class Graph:
 
             return min
 
-
         def edge_list_to_adjacency_matrix(edge_list):
             """Converts an edge list to an adjacency matrix.
 
@@ -5843,7 +5827,6 @@ class Graph:
 
             return adjacency_matrix
 
-
         def tree_from_edge_list(edge_list, root_index=0):
             
             adj_matrix = edge_list_to_adjacency_matrix(edge_list)
@@ -5982,7 +5965,6 @@ class Graph:
             pos[:, 0] = pos[:, 0] * np.pi * 1.98
             pos[:, 1] = pos[:, 1] / np.max(pos[:, 1]) 
 
-
             new_pos = np.zeros((num_nodes, 2))
             new_pos[:, 0] = pos[:, 1] * np.cos(pos[:, 0])
             new_pos[:, 1] = pos[:, 1] * np.sin(pos[:, 0])
@@ -6033,7 +6015,6 @@ class Graph:
         flat_graph = Graph.ByMeshData(positions, edges, v_dicts, e_dicts, tolerance=tolerance)
         return flat_graph
 
-
     @staticmethod
     def GlobalClusteringCoefficient(graph):
         """
@@ -6043,6 +6024,7 @@ class Graph:
         ----------
         graph : topologic_core.Graph
             The input graph.
+        
         Returns
         -------
         int
@@ -8159,6 +8141,7 @@ class Graph:
             If set, the returned list of vertices is sorted according to the dicitonary values stored under this key. The default is None.
         reverse : bool , optional
             If set to True, the vertices are sorted in reverse order (only if vertexKey is set). Otherwise, they are not. The default is False.
+        
         Returns
         -------
         list

topologicpy/Grid.py

@@ -213,7 +213,6 @@ class Grid():
             grid = Cluster.ByTopologies(gridEdges)
         return grid
 
-
     @staticmethod
     def VerticesByDistances(face=None,
                             origin=None,

topologicpy/Helper.py

@@ -495,8 +495,6 @@ class Helper:
 
         Parameters
         ----------
-        None
-            
 
         Returns
         -------