topologicpy 0.2.2__py3-none-any.whl → 0.2.3__py3-none-any.whl

topologicpy/CellComplex.py

@@ -5,7 +5,7 @@ import math
 class CellComplex(topologic.CellComplex):
     @staticmethod
     def Box(origin=None, width=1, length=1, height=1, uSides=2, vSides=2, wSides=2,
-                         dirX=0, dirY=0, dirZ=1, placement="center"):
+                         direction=[0,0,1], placement="center"):
         """
         Creates a box with internal cells.
 
@@ -25,12 +25,8 @@ class CellComplex(topologic.CellComplex):
             The number of sides along the length. The default is 1.
         wSides : int , optional
             The number of sides along the height. The default is 1.
-        dirX : float , optional
-            The X component of the vector representing the up direction of the box. The default is 0.
-        dirY : float , optional
-            The Y component of the vector representing the up direction of the box. The default is 0.
-        dirZ : float , optional
-            The Z component of the vector representing the up direction of the box. The default is 1.
+        direction : list , optional
+            The vector representing the up direction of the box. The default is [0,0,1].
         placement : str , optional
             The description of the placement of the origin of the box. This can be "bottom", "center", or "lowerleft". It is case insensitive. The default is "center".
 
@@ -41,7 +37,7 @@ class CellComplex(topologic.CellComplex):
 
         """
         return CellComplex.Prism(origin=origin, width=width, length=length, height=height, uSides=uSides, vSides=vSides, wSides=wSides,
-                         dirX=dirX, dirY=dirY, dirZ=dirZ, placement=placement)
+                         direction=direction, placement=placement)
     @staticmethod
     def ByCells(cells, tolerance=0.0001):
         """
@@ -135,24 +131,30 @@ class CellComplex(topologic.CellComplex):
         faces = [x for x in faces if isinstance(x, topologic.Face)]
         if len(faces) < 1:
             return None
-        cellComplex = topologic.CellComplex.ByFaces(faces, tolerance, False)
+        try:
+            cellComplex = topologic.CellComplex.ByFaces(faces, tolerance, False)
+        except:
+            cellComplex = None
         if not cellComplex:
-            warnings.warn("Warning: Default CellComplex.ByFaces method failed. Attempting to Merge the Faces.", UserWarning)
+            print("Warning: Default CellComplex.ByFaces method failed. Attempting to Merge the Faces.")
             cellComplex = faces[0]
             for i in range(1,len(faces)):
                 newCellComplex = None
                 try:
                     newCellComplex = cellComplex.Merge(faces[i], False)
                 except:
-                    warnings.warn("Warning: Failed to merge Face #"+i+". Skipping.", UserWarning)
+                    print("Warning: Failed to merge Face #"+str(i)+". Skipping.")
                 if newCellComplex:
                     cellComplex = newCellComplex
             if cellComplex.Type() != 64: #64 is the type of a CellComplex
-                warnings.warn("Warning: Input Faces do not form a CellComplex", UserWarning)
+                print("Warning: Input Faces do not form a CellComplex")
                 if cellComplex.Type() > 64:
                     returnCellComplexes = []
                     _ = cellComplex.CellComplexes(None, returnCellComplexes)
-                    return returnCellComplexes[0]
+                    if len(returnCellComplexes) > 0:
+                        return returnCellComplexes[0]
+                    else:
+                        return None
                 else:
                     return None
         else:
@@ -593,7 +595,7 @@ class CellComplex(topologic.CellComplex):
     
     @staticmethod
     def Prism(origin=None, width=1, length=1, height=1, uSides=2, vSides=2, wSides=2,
-                         dirX=0, dirY=0, dirZ=1, placement="center"):
+                         direction=[0,0,1], placement="center"):
         """
         Creates a prismatic cellComplex with internal cells.
 
@@ -613,12 +615,8 @@ class CellComplex(topologic.CellComplex):
             The number of sides along the length. The default is 1.
         wSides : int , optional
             The number of sides along the height. The default is 1.
-        dirX : float , optional
-            The X component of the vector representing the up direction of the prism. The default is 0.
-        dirY : float , optional
-            The Y component of the vector representing the up direction of the prism. The default is 0.
-        dirZ : float , optional
-            The Z component of the vector representing the up direction of the prism. The default is 1.
+        direction : list , optional
+            The vector representing the up direction of the prism. The default is [0,0,1].
         placement : str , optional
             The description of the placement of the origin of the prism. This can be "bottom", "center", or "lowerleft". It is case insensitive. The default is "center".
 
@@ -664,9 +662,9 @@ class CellComplex(topologic.CellComplex):
             x1 = origin.X()
             y1 = origin.Y()
             z1 = origin.Z()
-            x2 = origin.X() + dirX
-            y2 = origin.Y() + dirY
-            z2 = origin.Z() + dirZ
+            x2 = origin.X() + direction[0]
+            y2 = origin.Y() + direction[1]
+            z2 = origin.Z() + direction[2]
             dx = x2 - x1
             dy = y2 - y1
             dz = z2 - z1    

topologicpy/Cluster.py

@@ -378,7 +378,7 @@ class Cluster(topologic.Cluster):
             return topologic.Vertex.Type()
 
     @staticmethod
-    def MysticRose(wire=None, origin=None, radius=1, sides=16, perimeter=True, dirX=0, dirY=0, dirZ=1, placement="center", tolerance=0.0001):
+    def MysticRose(wire=None, origin=None, radius=1, sides=16, perimeter=True, direction=[0,0,1], placement="center", tolerance=0.0001):
         """
         Creates a mystic rose.
 
@@ -389,19 +389,15 @@ class Cluster(topologic.Cluster):
         origin : topologic.Vertex , optional
             The location of the origin of the circle. The default is None which results in the circle being placed at (0,0,0).
         radius : float , optional
-            The radius of the circle. The default is 1.
+            The radius of the mystic rose. The default is 1.
         sides : int, optional
-            The number of sides of the circle. The default is 16.
+            The number of sides of the mystic rose. The default is 16.
         perimeter : bool, optional
             If True, the perimeter edges are included in the output. The default is True.
-        dirX : float , optional
-            The X component of the vector representing the up direction of the circle. The default is 0.
-        dirY : float , optional
-            The Y component of the vector representing the up direction of the circle. The default is 0.
-        dirZ : float , optional
-            The Z component of the vector representing the up direction of the circle. The default is 1.
+        direction : list , optional
+            The vector representing the up direction of the mystic rose. The default is [0,0,1].
         placement : str , optional
-            The description of the placement of the origin of the circle. This can be "center", or "lowerleft". It is case insensitive. The default is "center".
+            The description of the placement of the origin of the mystic rose. This can be "center", or "lowerleft". It is case insensitive. The default is "center".
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
 
@@ -419,7 +415,7 @@ class Cluster(topologic.Cluster):
         from itertools import combinations
 
         if not wire:
-            wire = Wire.Circle(origin=origin, radius=radius, sides=sides, fromAngle=0, toAngle=360, close=True, dirX=dirX,dirY=dirY, dirZ=dirZ, placement=placement, tolerance=tolerance)
+            wire = Wire.Circle(origin=origin, radius=radius, sides=sides, fromAngle=0, toAngle=360, close=True, direction=direction, placement=placement, tolerance=tolerance)
         if not Wire.IsClosed(wire):
             return None
         vertices = Wire.Vertices(wire)

topologicpy/DGL.py

@@ -717,12 +717,17 @@ class DGL:
         accuracy = round(float(correct) / float(len(predicted)), mantissa)
         return {"accuracy":accuracy, "correct":correct, "mask":mask, "size":size, "wrong":wrong}
     
-    def ConfusionMatrix(actual, predicted, categories, renderer="notebook"):
+    def ConfusionMatrix(actual, predicted, normalize=False):
         from sklearn import metrics
-        return metrics.confusion_matrix(actual, predicted)
+        if normalize:
+            cf = metrics.confusion_matrix(y_true=actual, y_pred=predicted, normalize="true")
+        else:
+            cf = metrics.confusion_matrix(y_true=actual, y_pred=predicted)
+        return cf
+
 
     @staticmethod
-    def ClassifierBypath(path):
+    def ClassifierByFilePath(path):
         """
         Returns the classifier found at the input file path.
         Parameters

topologicpy/Face.py

@@ -548,8 +548,8 @@ class Face(topologic.Face):
         return Face.ByWires(externalBoundary, internalBoundaries)
     
     @staticmethod
-    def Circle(origin=None, radius=0.5, sides=16, fromAngle=0, toAngle=360, dirX=0,
-                   dirY=0, dirZ=1, placement="center", tolerance=0.0001):
+    def Circle(origin=None, radius=0.5, sides=16, fromAngle=0, toAngle=360, direction=[0,0,1],
+                   placement="center", tolerance=0.0001):
         """
         Creates a circle.
 
@@ -565,12 +565,8 @@ class Face(topologic.Face):
             The angle in degrees from which to start creating the arc of the circle. The default is 0.
         toAngle : float , optional
             The angle in degrees at which to end creating the arc of the circle. The default is 360.
-        dirX : float , optional
-            The X component of the vector representing the up direction of the circle. The default is 0.
-        dirY : float , optional
-            The Y component of the vector representing the up direction of the circle. The default is 0.
-        dirZ : float , optional
-            The Z component of the vector representing the up direction of the circle. The default is 1.
+        direction : list , optional
+            The vector representing the up direction of the circle. The default is [0,0,1].
         placement : str , optional
             The description of the placement of the origin of the circle. This can be "center", or "lowerleft". It is case insensitive. The default is "center".
         tolerance : float , optional
@@ -583,7 +579,7 @@ class Face(topologic.Face):
 
         """
         from topologicpy.Wire import Wire
-        wire = Wire.Circle(origin, radius, sides, fromAngle, toAngle, True, dirX, dirY, dirZ, placement, tolerance)
+        wire = Wire.Circle(origin=origin, radius=radius, sides=sides, fromAngle=fromAngle, toAngle=toAngle, close=True, direction=direction, placement=placement, tolerance=tolerance)
         if not isinstance(wire, topologic.Wire):
             return None
         return Face.ByWire(wire)
@@ -705,7 +701,7 @@ class Face(topologic.Face):
         return True
     
     @staticmethod
-    def Flatten(face, oldLocation=None, newLocation=None):
+    def Flatten(face, oldLocation=None, newLocation=None, direction=None):
         """
         Flattens the input face such that its center of mass is located at the origin and its normal is pointed in the positive Z axis.
 
@@ -717,6 +713,8 @@ class Face(topologic.Face):
             The old location to use as the origin of the movement. If set to None, the center of mass of the input topology is used. The default is None.
         newLocation : topologic.Vertex , optional
             The new location at which to place the topology. If set to None, the world origin (0,0,0) is used. The default is None.
+        direction : list , optional
+            The direction, expressed as a list of [X,Y,Z] that signifies the direction of the face. If set to None, the normal at *u* 0.5 and *v* 0.5 is considered the direction of the face. The deafult is None.
 
         Returns
         -------
@@ -735,13 +733,14 @@ class Face(topologic.Face):
             newLocation = Vertex.ByCoordinates(0,0,0)
         cm = oldLocation
         world_origin = newLocation
-        coords = Face.NormalAtParameters(face, 0.5, 0.5)
+        if not direction or len(direction) < 3:
+            direction = Face.NormalAtParameters(face, 0.5, 0.5)
         x1 = Vertex.X(cm)
         y1 = Vertex.Y(cm)
         z1 = Vertex.Z(cm)
-        x2 = Vertex.X(cm) + coords[0]
-        y2 = Vertex.Y(cm) + coords[1]
-        z2 = Vertex.Z(cm) + coords[2]
+        x2 = Vertex.X(cm) + direction[0]
+        y2 = Vertex.Y(cm) + direction[1]
+        z2 = Vertex.Z(cm) + direction[2]
         dx = x2 - x1
         dy = y2 - y1
         dz = z2 - z1    
@@ -775,6 +774,54 @@ class Face(topologic.Face):
         flatFace = Topology.SetDictionary(flatFace, dictionary)
         return flatFace
     
+    @staticmethod
+    def Planarize(face, origin=None, direction=None):
+        """
+        Planarizes the input face such that its center of mass is located at the input origin and its normal is pointed in the input direction.
+
+        Parameters
+        ----------
+        face : topologic.Face
+            The input face.
+        origin : topologic.Vertex , optional
+            The old location to use as the origin of the movement. If set to None, the center of mass of the input face is used. The default is None.
+        direction : list , optional
+            The direction, expressed as a list of [X,Y,Z] that signifies the direction of the face. If set to None, the normal at *u* 0.5 and *v* 0.5 is considered the direction of the face. The deafult is None.
+
+        Returns
+        -------
+        topologic.Face
+            The planarized face.
+
+        """
+
+        from topologicpy.Vertex import Vertex
+        from topologicpy.Wire import Wire
+        from topologicpy.Topology import Topology
+        from topologicpy.Dictionary import Dictionary
+
+        if not isinstance(face, topologic.Face):
+            return None
+        if not isinstance(origin, topologic.Vertex):
+            origin = Topology.CenterOfMass(face)
+        if not isinstance(direction, list):
+            direction = Face.NormalAtParameters(face, 0.5, 0.5)
+        flatFace = Face.Flatten(face, oldLocation=origin, direction=direction)
+
+        world_origin = Vertex.ByCoordinates(0,0,0)
+        # Retrieve the needed transformations
+        dictionary = Topology.Dictionary(flatFace)
+        xTran = Dictionary.ValueAtKey(dictionary,"xTran")
+        yTran = Dictionary.ValueAtKey(dictionary,"yTran")
+        zTran = Dictionary.ValueAtKey(dictionary,"zTran")
+        phi = Dictionary.ValueAtKey(dictionary,"phi")
+        theta = Dictionary.ValueAtKey(dictionary,"theta")
+
+        planarizedFace = Topology.Rotate(flatFace, origin=world_origin, x=0, y=1, z=0, degree=theta)
+        planarizedFace = Topology.Rotate(planarizedFace, origin=world_origin, x=0, y=0, z=1, degree=phi)
+        planarizedFace = Topology.Translate(planarizedFace, xTran, yTran, zTran)
+        return planarizedFace
+
     @staticmethod
     def Harmonize(face):
         """
@@ -1206,6 +1253,57 @@ class Face(topologic.Face):
             returnResult = None
         return returnResult
     
+    @staticmethod
+    def NormalEdge(face, length=1):
+        """
+        Returns the normal vector to the input face as an edge with the desired input length. A normal vector of a face is a vector perpendicular to it.
+
+        Parameters
+        ----------
+        face : topologic.Face
+            The input face.
+        length : float , optional
+            The desired length of the normal edge. The default is 1.
+
+        Returns
+        -------
+        topologic.Edge
+            The created normal edge to the input face. This is computed at the approximate center of the face.
+
+        """
+        return Face.NormalEdgeAtParameters(face, u=0.5, v=0.5, length=length)
+
+    @staticmethod
+    def NormalEdgeAtParameters(face, u=0.5, v=0.5, length=1):
+        """
+        Returns the normal vector to the input face as an edge with the desired input length. A normal vector of a face is a vector perpendicular to it.
+
+        Parameters
+        ----------
+        face : topologic.Face
+            The input face.
+        u : float , optional
+            The *u* parameter at which to compute the normal to the input face. The default is 0.5.
+        v : float , optional
+            The *v* parameter at which to compute the normal to the input face. The default is 0.5.
+        length : float , optional
+            The desired length of the normal edge. The default is 1.
+
+        Returns
+        -------
+        topologic.Edge
+            The created normal edge to the input face. This is computed at the approximate center of the face.
+
+        """
+        from topologicpy.Edge import Edge
+        from topologicpy.Topology import Topology
+        if not isinstance(face, topologic.Face):
+            return None
+        sv = Face.VertexByParameters(face=face, u=u, v=v)
+        vec = Face.NormalAtParameters(face, u=u, v=v)
+        ev = Topology.TranslateByDirectionDistance(sv, vec, length)
+        return Edge.ByVertices([sv, ev])
+    
     @staticmethod
     def Project(faceA, faceB, direction=None, mantissa=4, tolerance=0.0001):
         """
@@ -1250,7 +1348,7 @@ class Face(topologic.Face):
         return Face.ByWires(p_eb, p_ib_list)
 
     @staticmethod
-    def Rectangle(origin=None, width=1.0, length=1.0, dirX=0, dirY=0, dirZ=1, placement="center", tolerance=0.0001):
+    def Rectangle(origin=None, width=1.0, length=1.0, direction=[0,0,1], placement="center", tolerance=0.0001):
         """
         Creates a rectangle.
 
@@ -1262,12 +1360,8 @@ class Face(topologic.Face):
             The width of the rectangle. The default is 1.0.
         length : float , optional
             The length of the rectangle. The default is 1.0.
-        dirX : float , optional
-            The X component of the vector representing the up direction of the rectangle. The default is 0.
-        dirY : float , optional
-            The Y component of the vector representing the up direction of the rectangle. The default is 0.
-        dirZ : float , optional
-            The Z component of the vector representing the up direction of the rectangle. The default is 1.
+        direction : list , optional
+            The vector representing the up direction of the rectangle. The default is [0,0,1].
         placement : str , optional
             The description of the placement of the origin of the rectangle. This can be "center", or "lowerleft". It is case insensitive. The default is "center".
         tolerance : float , optional
@@ -1279,13 +1373,13 @@ class Face(topologic.Face):
             The created face.
 
         """
-        wire = Wire.Rectangle(origin, width, length, dirX, dirY, dirZ, placement, tolerance)
+        wire = Wire.Rectangle(origin=origin, width=width, length=length, direction=direction, placement=placement, tolerance=tolerance)
         if not isinstance(wire, topologic.Wire):
             return None
         return Face.ByWire(wire)
 
     @staticmethod
-    def Star(origin=None, radiusA=1.0, radiusB=0.4, rays=5, dirX=0, dirY=0, dirZ=1, placement="center", tolerance=0.0001):
+    def Star(origin=None, radiusA=1.0, radiusB=0.4, rays=5, direction=[0,0,1], placement="center", tolerance=0.0001):
         """
         Creates a star.
 
@@ -1299,12 +1393,8 @@ class Face(topologic.Face):
             The outer radius of the star. The default is 0.4.
         rays : int , optional
             The number of star rays. The default is 5.
-        dirX : float , optional
-            The X component of the vector representing the up direction of the star. The default is 0.
-        dirY : float , optional
-            The Y component of the vector representing the up direction of the star. The default is 0.
-        dirZ : float , optional
-            The Z component of the vector representing the up direction of the star. The default is 1.
+        direction : list , optional
+            The vector representing the up direction of the star. The default is [0,0,1].
         placement : str , optional
             The description of the placement of the origin of the star. This can be "center", or "lowerleft". It is case insensitive. The default is "center".
         tolerance : float , optional
@@ -1316,13 +1406,13 @@ class Face(topologic.Face):
             The created face.
 
         """
-        wire = Wire.Star(origin, radiusA, radiusB, rays, dirX, dirY, dirZ, placement, tolerance)
+        wire = Wire.Star(origin=origin, radiusA=radiusA, radiusB=radiusB, rays=rays, direction=direction, placement=placement, tolerance=tolerance)
         if not isinstance(wire, topologic.Wire):
             return None
         return Face.ByWire(wire)
 
     @staticmethod
-    def Trapezoid(origin=None, widthA=1.0, widthB=0.75, offsetA=0.0, offsetB=0.0, length=1.0, dirX=0, dirY=0, dirZ=1, placement="center", tolerance=0.0001):
+    def Trapezoid(origin=None, widthA=1.0, widthB=0.75, offsetA=0.0, offsetB=0.0, length=1.0, direction=[0,0,1], placement="center", tolerance=0.0001):
         """
         Creates a trapezoid.
 
@@ -1340,12 +1430,8 @@ class Face(topologic.Face):
             The offset of the top edge of the trapezoid. The default is 0.0.
         length : float , optional
             The length of the trapezoid. The default is 1.0.
-        dirX : float , optional
-            The X component of the vector representing the up direction of the trapezoid. The default is 0.
-        dirY : float , optional
-            The Y component of the vector representing the up direction of the trapezoid. The default is 0.
-        dirZ : float , optional
-            The Z component of the vector representing the up direction of the trapezoid. The default is 1.
+        direction : list , optional
+            The vector representing the up direction of the trapezoid. The default is [0,0,1].
         placement : str , optional
             The description of the placement of the origin of the trapezoid. This can be "center", or "lowerleft". It is case insensitive. The default is "center".
         tolerance : float , optional
@@ -1357,7 +1443,7 @@ class Face(topologic.Face):
             The created trapezoid.
 
         """
-        wire = Wire.Trapezoid(origin, widthA, widthB, offsetA, offsetB, length, dirX, dirY, dirZ, placement, tolerance)
+        wire = Wire.Trapezoid(origin=origin, widthA=widthA, widthB=widthB, offsetA=offsetA, offsetB=offsetB, length=length, direction=direction, placement=placement, tolerance=tolerance)
         if not isinstance(wire, topologic.Wire):
             return None
         return Face.ByWire(wire)