topologicpy 0.7.24__py3-none-any.whl → 0.7.27__py3-none-any.whl

topologicpy/ANN.py

@@ -110,7 +110,7 @@ import numpy as np
 class _ANN(nn.Module):
     def __init__(self, input_size, hyperparameters, dataset=None):
         super(_ANN, self).__init__()
-        self.title = hyperparameters['title']
+        self.title =  hyperparameters.get('title', 'Untitled')
         self.task_type = hyperparameters['task_type']
         self.cross_val_type = hyperparameters['cross_val_type']
         self.k_folds = hyperparameters.get('k_folds', 5)
@@ -576,6 +576,10 @@ class ANN():
                         interval = 1,
                         mantissa = 6):
         """
+        Returns a Hyperparameters dictionary based on the input parameters.
+
+        Parameters
+        ----------
         title : str , optional
             The desired title for the dataset. The default is "Untitled".
         taskType : str , optional
@@ -623,6 +627,7 @@ class ANN():
         -------
         dict
             Returns a dictionary with the following keys:
+            'title'
             'task_type'
             'test_ratio'
             'validation_ratio'
@@ -632,13 +637,14 @@ class ANN():
             'batch_size'
             'early_stopping'
             'patience'
-            'random_tate'
+            'random_state'
             'cross_val_type'
             'kFolds'
             'interval'
             'mantissa'
         """
         return {
+                'title': title,
                 'task_type': taskType,
                 'test_ratio': testRatio,
                 'validation_ratio': validationRatio,

topologicpy/Cell.py

@@ -99,7 +99,7 @@ class Cell():
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
         silent : bool , optional
-            If set to False, error and warning messages are printed. Otherwise, they are not. The default is False.
+            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
 
         Returns
         -------
@@ -384,7 +384,7 @@ class Cell():
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
         silent : bool , optional
-            If set to False, error and warning messages are printed. Otherwise, they are not. The default is False.
+            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
 
         Raises
         ------

topologicpy/Cluster.py

@@ -154,7 +154,8 @@ class Cluster():
         transferDictionaries : bool , optional
             If set to True, the dictionaries from the input topologies are merged and transferred to the cluster. Otherwise they are not. The default is False.
         silent : bool , optional
-            If set to True, error and warning messages are not displayed. Otherwise, they are. The default is False.
+            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
+        
         Returns
         -------
         topologic_core.Cluster

topologicpy/Dictionary.py

@@ -162,7 +162,7 @@ class Dictionary():
         dictionaries : list or comma separated dictionaries
             The input list of dictionaries to be merged.
         silent : bool , optional
-            If set to True, error and warning messages are not displayed. Otherwise, they are. The default is False.
+            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
 
         Returns
         -------

topologicpy/Edge.py

@@ -232,7 +232,7 @@ class Edge():
         tolerance : float , optional
             The desired tolerance to decide if an Edge can be created. The default is 0.0001.
         silent : bool , optional
-            If set to False, error and warning messages are printed. Otherwise, they are not. The default is False.
+            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
         
         Returns
         -------
@@ -280,7 +280,7 @@ class Edge():
         tolerance : float , optional
             The desired tolerance to decide if an edge can be created. The default is 0.0001.
         silent : bool , optional
-            If set to True, error and warning messages are printed. Otherwise, they are not. The default is True.
+            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
 
         Returns
         -------
@@ -475,10 +475,12 @@ class Edge():
             The first input edge. This edge will be extended to meet edgeB.
         edgeB : topologic_core.Edge
             The second input edge. This edge will be used to extend edgeA.
+        mantissa : int , optional
+            The desired length of the mantissa. The default is 6.
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
         silent : bool , optional
-            If set to True, not error or warning messages are printed. Otherwise, they are. The default is False.
+            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
         
         Returns
         -------
@@ -530,7 +532,8 @@ class Edge():
         intVertex = Topology.Intersect(new_edge, edgeB, tolerance=tolerance)
         if intVertex:
             return Edge.ByVertices([v1, intVertex], tolerance=tolerance, silent=True)
-        print("Edge.ExtendToEdge - Error: The operation failed. Returning None.")
+        if not silent:
+            print("Edge.ExtendToEdge - Error: The operation failed. Returning None.")
         return None
     
     @staticmethod
@@ -764,8 +767,8 @@ class Edge():
             The second input edge.
         mantissa : int , optional
             The desired length of the mantissa. The default is 6.
-        angTolerance : float , optional
-            The angular tolerance used for the test. The default is 0.1.
+        tolerance : float , optional
+            The desired tolerance. The default is 0.0001.
 
         Returns
         -------
@@ -934,11 +937,11 @@ class Edge():
         if not Topology.IsInstance(edge, "Edge"):
             print("Edge.Normal - Error: The input edge parameter is not a valid edge. Returning None.")
             return None
-        normal_edge = Edge.NormalAsEdge(edge, length=1.0, u=0.5, angle=angle)
+        normal_edge = Edge.NormalEdge(edge, length=1.0, u=0.5, angle=angle)
         return Edge.Direction(normal_edge)
 
     @staticmethod
-    def NormalAsEdge(edge, length: float = 1.0, u: float = 0.5, angle: float = 0.0):
+    def NormalEdge(edge, length: float = 1.0, u: float = 0.5, angle: float = 0.0):
         """
         Returns the normal (perpendicular) vector to the input edge as an edge.
 
@@ -994,10 +997,10 @@ class Edge():
             return start_vertex, list(normal_end_vertex)
 
         if not Topology.IsInstance(edge, "Edge"):
-            print("Edge.NormalAsEdge - Error: The input edge parameter is not a valid edge. Returning None.")
+            print("Edge.NormalEdge - Error: The input edge parameter is not a valid edge. Returning None.")
             return None
         if length <= 0.0:
-            print("Edge.NormalAsEdge - Error: The input length parameter is not a positive number greater than zero. Returning None.")
+            print("Edge.NormalEdge - Error: The input length parameter is not a positive number greater than zero. Returning None.")
             return None
         edge_direction = Edge.Direction(edge)
         x, y, z = edge_direction
@@ -1060,7 +1063,7 @@ class Edge():
         mantissa : int , optional
             The desired length of the mantissa. The default is 6.
         silent : bool , optional
-            If set to False, error and warning messages are printed. Otherwise, they are not. The default is False.
+            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
 
         Returns
         -------
@@ -1236,7 +1239,7 @@ class Edge():
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
         silent : bool , optional
-            If set to True, not error or warning messages are printed. Otherwise, they are. The default is False.
+            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
         
         Returns
         -------

topologicpy/Face.py

@@ -133,6 +133,10 @@ class Face():
             return None
         dirA = Face.Normal(faceA, outputType="xyz", mantissa=3)
         dirB = Face.Normal(faceB, outputType="xyz", mantissa=3)
+        if dirA == None or dirB == None:
+            Topology.Show(faceA, faceB)
+            print("Face.Angle - Error: Could not compute the angle between the two input faces. Returning None.")
+            return None
         return round((Vector.Angle(dirA, dirB)), mantissa)
 
     @staticmethod
@@ -559,8 +563,8 @@ class Face():
             The input wire.
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
-        silent : bool , optional
-            If set to False, error and warning messages are printed. Otherwise, they are not. The default is False.
+         silent : bool , optional
+            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
 
         Returns
         -------
@@ -648,7 +652,7 @@ class Face():
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
         silent : bool , optional
-            If set to False, error messages are printed. Otherwise, they are not. The default is False.
+            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
 
         Returns
         -------
@@ -691,7 +695,7 @@ class Face():
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
         silent : bool , optional
-            If set to False, error messages are printed. Otherwise, they are not. The default is False.
+            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
         
         Returns
         -------
@@ -1119,7 +1123,7 @@ class Face():
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
         silent : bool , optional
-            If set to False, error and warning messages are printed. Otherwise, they are not. The default is False.
+            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
 
         Returns
         -------
@@ -1684,6 +1688,7 @@ class Face():
         from topologicpy.Vertex import Vertex
         import os
         import warnings
+
         try:
             import numpy as np
         except:
@@ -1703,60 +1708,64 @@ class Face():
             print("Face.Normal - Error: The input face parameter is not a valid face. Returning None.")
             return None
         
-        #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:
-            print("Face.Normal - Error: At least three vertices are required to define a plane. Returning None.")
-            return None
-        
-        # Convert vertices to numpy array for easier manipulation
-        vertices = np.array(vertices)
-        
-        # Try to find two non-collinear edge vectors
-        vec1 = None
-        vec2 = None
-        for i in range(1, len(vertices)):
-            for j in range(i + 1, len(vertices)):
-                temp_vec1 = vertices[i] - vertices[0]
-                temp_vec2 = vertices[j] - vertices[0]
-                cross_product = np.cross(temp_vec1, temp_vec2)
-                if np.linalg.norm(cross_product) > 1e-6:  # Check if the cross product is not near zero
-                    vec1 = temp_vec1
-                    vec2 = temp_vec2
+        return_normal = None
+        try:
+            return_normal = list(topologic.FaceUtility.NormalAtParameters(face, 0.5, 0.5))
+        except:
+            vertices = Topology.Vertices(face)+Topology.Centroid(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:
+                print("Face.Normal - Error: At least three vertices are required to define a plane. Returning None.")
+                return None
+            
+            # Convert vertices to numpy array for easier manipulation
+            vertices = np.array(vertices)
+            
+            # Try to find two non-collinear edge vectors
+            vec1 = None
+            vec2 = None
+            for i in range(1, len(vertices)):
+                for j in range(i + 1, len(vertices)):
+                    temp_vec1 = vertices[i] - vertices[0]
+                    temp_vec2 = vertices[j] - vertices[0]
+                    cross_product = np.cross(temp_vec1, temp_vec2)
+                    if np.linalg.norm(cross_product) > 1e-6:  # Check if the cross product is not near zero
+                        vec1 = temp_vec1
+                        vec2 = temp_vec2
+                        break
+                if vec1 is not None and vec2 is not None:
                     break
-            if vec1 is not None and vec2 is not None:
-                break
-        
-        if vec1 is None or vec2 is None:
-            print("Face.Normal - Error: The given vertices do not form a valid plane (all vertices might be collinear). Returning None.")
-            return None
-        
-        # Calculate the cross product of the two edge vectors
-        normal = np.cross(vec1, vec2)
+            
+            if vec1 is None or vec2 is None:
+                print("Face.Normal - Error: The given vertices do not form a valid plane (all vertices might be collinear). Returning None.")
+                return None
+            
+            # Calculate the cross product of the two edge vectors
+            normal = np.cross(vec1, vec2)
 
-        # Normalize the normal vector
-        normal_length = np.linalg.norm(normal)
-        if normal_length == 0:
-            print("Face.Normal - Error: The given vertices do not form a valid plane (cross product resulted in a zero vector). Returning None.")
-            return None
-        
-        normal = normal / normal_length
-        normal = normal.tolist()
-        normal = [round(x, mantissa) for x in normal]
-        return_normal = []
-        outputType = list(outputType.lower())
-        for axis in outputType:
-            if axis == "x":
-                return_normal.append(normal[0])
-            elif axis == "y":
-                return_normal.append(normal[1])
-            elif axis == "z":
-                return_normal.append(normal[2])
+            # Normalize the normal vector
+            normal_length = np.linalg.norm(normal)
+            if normal_length == 0:
+                print("Face.Normal - Error: The given vertices do not form a valid plane (cross product resulted in a zero vector). Returning None.")
+                return None
+            
+            normal = normal / normal_length
+            normal = normal.tolist()
+            normal = [round(x, mantissa) for x in normal]
+            return_normal = []
+            outputType = list(outputType.lower())
+            for axis in outputType:
+                if axis == "x":
+                    return_normal.append(normal[0])
+                elif axis == "y":
+                    return_normal.append(normal[1])
+                elif axis == "z":
+                    return_normal.append(normal[2])
         return return_normal
     
     @staticmethod

topologicpy/Graph.py

@@ -158,7 +158,7 @@ class WorkerProcess(Process):
                     continue
                 if Vertex.Distance(source, destination) > self.tolerance:
                     edge = Edge.ByVertices([source, destination])
-                    e = Topology.Boolean(edge, face, operation="intersect")
+                    e = Topology.Intersect(edge, face)
                     if Topology.IsInstance(e, "Edge"):
                         edges.append(edge)
                 self.used[i + self.start_index][j] = 1
@@ -3991,8 +3991,8 @@ class Graph:
         maxColors : int , optional
             The desired maximum number of colors to test against. The default is 3.
         silent : bool , optional
-            If set to False, error and warning messages are printed. Otherwise, they are not. The default is False.
-        
+            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
+       
         Returns
         -------
         int

topologicpy/Shell.py

@@ -389,8 +389,8 @@ class Shell():
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
         silent : bool , optional
-            If set to False, error and warning messages are printed. Otherwise, they are not. The default is False.
-        
+            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
+       
         Returns
         -------
         topologic_core.Shell
@@ -485,7 +485,7 @@ class Shell():
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
         silent : bool , optional
-            If set to False, error and warning messages are printed. Otherwise, they are not. The default is False.
+            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
 
         Returns
         -------