cytriangle 1.0.1__cp39-cp39-macosx_14_0_arm64.whl → 1.0.2__cp39-cp39-macosx_14_0_arm64.whl

cytriangle/cytriangleio.pxd

@@ -1,5 +1,4 @@
 from cytriangle.ctriangle cimport triangulateio
 
 cdef class TriangleIO:
-    cdef int out_flag
     cdef triangulateio* _io

cytriangle/cytriangleio.pyx

@@ -2,6 +2,7 @@ from libc.stdlib cimport free, malloc
 import numpy as np
 from cytriangle.ctriangle cimport triangulateio
 
+
 def validate_input_attributes(attributes):
     num_attr = list(set([len(sublist) for sublist in attributes]))
     if len(num_attr) > 1:
@@ -14,16 +15,16 @@ def validate_input_attributes(attributes):
 def validate_attribute_number(attributes, base_quantity):
     if len(attributes) != base_quantity:
         raise ValueError(
-            "Attribute list must have the same number of elements as the input it decorates"
+            """Attribute list must have the same number of elements as the
+            input it decorates"""
         )
 
+
 cdef class TriangleIO:
 
     def __cinit__(self):
         # Initialize the triangulateio struct with NULL pointers
         self._io = <triangulateio*> NULL
-        # out flag prevents freeing shared in / out struct data twice
-        self.out_flag = 0
 
     def __dealloc__(self):
         # Free allocated memory when the instance is deallocated
@@ -47,9 +48,9 @@ cdef class TriangleIO:
                 free(self._io.segmentlist)
             if self._io.segmentmarkerlist is not NULL:
                 free(self._io.segmentmarkerlist)
-            if self._io.holelist is not NULL and self.out_flag != 1:
+            if self._io.holelist is not NULL:
                 free(self._io.holelist)
-            if self._io.regionlist is not NULL and self.out_flag != 1:
+            if self._io.regionlist is not NULL:
                 free(self._io.regionlist)
             if self._io.edgelist is not NULL:
                 free(self._io.edgelist)
@@ -59,10 +60,7 @@ cdef class TriangleIO:
                 free(self._io.normlist)
             free(self._io)
 
-    def __init__(self, input_dict=None,kind=''):
-        # Prevent double deallocation on 'out' triangleio structs
-        if kind == 'out':
-            self.out_flag = 1
+    def __init__(self, input_dict=None):
         # Assemble the triangulateio struct from a Python dictionary (default)
         self._io = <triangulateio*> malloc(sizeof(triangulateio))
 
@@ -125,12 +123,13 @@ cdef class TriangleIO:
             if 'regions' in input_dict:
                 self.set_regions(input_dict['regions'])
 
-    def to_dict(self,opt=''):
+    def to_dict(self, opt=''):
         """
         Converts the internal C TriangleIO data structure into a dictionary format.
 
         Parameters:
-        - opt: A string that indicates the format of the output. If 'np', numpy arrays are used.
+        - opt: A string that indicates the format of the output. If 'np',
+          numpy arrays are used.
 
         Returns:
         - A dictionary containing the triangulation data.
@@ -147,7 +146,8 @@ cdef class TriangleIO:
             if self.triangles:
                 output_dict['triangles'] = np.asarray(self.triangles)
             if self.triangle_attributes:
-                output_dict['triangle_attributes'] = np.asarray(self.triangle_attributes)
+                output_dict['triangle_attributes'] = np.asarray(
+                    self.triangle_attributes)
         else:
             if self.vertices:
                 output_dict['vertices'] = self.vertices
@@ -212,7 +212,9 @@ cdef class TriangleIO:
                 vertex_attr = []
                 for j in range(self._io.numberofpointattributes):
                     vertex_attr.append(
-                        self._io.pointattributelist[i*self._io.numberofpointattributes + j ]
+                        self._io.pointattributelist[
+                            i*self._io.numberofpointattributes + j
+                        ]
                     )
                 vertex_attributes.append(vertex_attr)
             return vertex_attributes
@@ -239,8 +241,9 @@ cdef class TriangleIO:
     @property
     def triangles(self):
         """
-        `triangles`: A list of triangle corners (not necessarily 3). Corners are designated
-        in a counterclockwise order, followed by any other nodes if the triangle represents a
+        `triangles`: A list of triangle corners (not necessarily 3).
+        Corners are designated in a counterclockwise order,
+        followed by any other nodes if the triangle represents a
         nonlinear element (e.g. num_corners > 3).
 
         Returns:
@@ -251,7 +254,9 @@ cdef class TriangleIO:
             for i in range(self._io.numberoftriangles):
                 tri_order = []
                 for j in range(self._io.numberofcorners):
-                    tri_order.append(self._io.trianglelist[i * self._io.numberofcorners + j])
+                    tri_order.append(self._io.trianglelist[
+                        i * self._io.numberofcorners + j
+                    ])
                 triangles.append(tri_order)
             return triangles
 
@@ -274,7 +279,9 @@ cdef class TriangleIO:
                 triangle_attr = []
                 for j in range(self._io.numberoftriangleattributes):
                     triangle_attr.append(
-                        self._io.triangleattributelist[i*self._io.numberoftriangleattributes + j]
+                        self._io.triangleattributelist[
+                            i*self._io.numberoftriangleattributes + j
+                        ]
                     )
                 triangle_attributes.append(triangle_attr)
             return triangle_attributes
@@ -286,7 +293,8 @@ cdef class TriangleIO:
     @property
     def triangle_max_area(self):
         """
-        `triangle_max_area`: A list of triangle area constraints; one per triangle, 0 if not set.
+        `triangle_max_area`: A list of triangle area constraints;
+        one per triangle, 0 if not set.
         Input only.
 
         Returns:
@@ -306,7 +314,8 @@ cdef class TriangleIO:
         `neighbors`: A list of triangle neighbors; three ints per triangle. Output only.
 
         Returns:
-        - A list of lists, where each inner list contains indices of neighboring triangles.
+        - A list of lists, where each inner list contains indices of neighboring
+          triangles.
         """
         max_neighbors = 3
         if self._io.neighborlist is not NULL:
@@ -391,7 +400,8 @@ cdef class TriangleIO:
             regions = []
             for i in range(self._io.numberofregions):
                 region = {}
-                region['vertex'] = [self._io.regionlist[4*i], self._io.regionlist[4*i + 1]]
+                region['vertex'] = [self._io.regionlist[4*i],
+                                    self._io.regionlist[4*i + 1]]
                 region['marker'] = int(self._io.regionlist[4*i + 2])
                 region['max_area'] = self._io.regionlist[4*i + 3]
                 regions.append(region)
@@ -465,7 +475,8 @@ cdef class TriangleIO:
         num_vertices = self._io.numberofpoints
         validate_attribute_number(vertex_attributes, num_vertices)
         vertex_attributes = np.ascontiguousarray(vertex_attributes)
-        self._io.pointattributelist = <double*>malloc(num_attr * num_vertices * sizeof(double))
+        self._io.pointattributelist = <double*>malloc(
+            num_attr * num_vertices * sizeof(double))
         self._io.numberofpointattributes = num_attr
         for i in range(num_vertices):
             for j in range(num_attr):
@@ -492,11 +503,13 @@ cdef class TriangleIO:
         num_triangles = self._io.numberoftriangles
         validate_attribute_number(triangle_attributes, num_triangles)
         triangle_attributes = np.ascontiguousarray(triangle_attributes)
-        self._io.triangleattributelist = <double*>malloc(num_attr * num_triangles * sizeof(double))
+        self._io.triangleattributelist = <double*>malloc(
+            num_attr * num_triangles * sizeof(double))
         self._io.numberoftriangleattributes = num_attr
         for i in range(num_triangles):
             for j in range(num_attr):
-                self._io.triangleattributelist[i * num_attr + j] = triangle_attributes[i, j]
+                self._io.triangleattributelist[
+                    i * num_attr + j] = triangle_attributes[i, j]
 
     def set_triangle_areas(self, triangle_areas):
         num_triangles = self._io.numberoftriangles
@@ -518,7 +531,8 @@ cdef class TriangleIO:
     def set_segment_markers(self, segment_markers):
         segment_markers = np.ascontiguousarray(segment_markers, dtype=int)
         validate_attribute_number(segment_markers, self._io.numberofsegments)
-        self._io.segmentmarkerlist = <int*>malloc(self._io.numberofsegments * sizeof(int))
+        self._io.segmentmarkerlist = <int*>malloc(
+            self._io.numberofsegments * sizeof(int))
         for i in range(self._io.numberofsegments):
             self._io.segmentmarkerlist[i] = segment_markers[i]
 

{cytriangle-1.0.1.dist-info → cytriangle-1.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cytriangle
-Version: 1.0.1
+Version: 1.0.2
 Summary: Object-oriented Cython wrapper of Shewchuk's Triangle Library
 Home-page: https://github.com/m-clare/cytriangle
 License: LGPL 3.0

cytriangle-1.0.2.dist-info/RECORD

@@ -0,0 +1,13 @@
+cytriangle/__init__.py,sha256=kEwfRnZoTHQyXpzGRGT2qSmCNuaFBLOSLXbSoSfTc6I,138
+cytriangle/ctriangle.pxd,sha256=YJL_UQqC-O6tccoYEz6uO02V7U3aqtv0B68K43g9Z9o,877
+cytriangle/cytriangle.c,sha256=oRCNJMnsZ6gyOyprv4Wv6OqggY0872NySA-AHegGEuY,567368
+cytriangle/cytriangle.pyx,sha256=gOumyTTJe8z-oMhCuPgDp0V2Yy9MootqnJ-HNvMjTWg,9019
+cytriangle/cytriangleio.c,sha256=YVdzsdqD3EH5Elm5rbDUH2S0MhY3fJISCNbswRX6huI,908054
+cytriangle/cytriangleio.pxd,sha256=0i9ovT56F-4X6p9WnZTOCmtNAD6Jfr3Yw9PnUYbAl_0,100
+cytriangle/cytriangleio.pyx,sha256=mLSi4psbq5fEXjkbVHx6ru3ES3LbQywpu9D-hQ6d01E,22302
+cytriangle/cytriangle.cpython-39-darwin.so,sha256=DK44iZKkh98moh3eRyld_BxuNqGNJ0Uh2rBO7r4Qqcc,584480
+cytriangle/cytriangleio.cpython-39-darwin.so,sha256=iiVheQHUQv9Qqpwd2BYmokaONVodtNMy2QKo8ON6YWg,700528
+cytriangle-1.0.2.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+cytriangle-1.0.2.dist-info/METADATA,sha256=Kr0wjoWUuOkD7gKfhtguJn7uZfCmaj1wuV8y0spNfBo,2000
+cytriangle-1.0.2.dist-info/WHEEL,sha256=G_WFxUbzDt1TgEo0jVMo4tP9Q2ZdlmLbhDg1HCJ0lsY,104
+cytriangle-1.0.2.dist-info/RECORD,,

cytriangle-1.0.1.dist-info/RECORD

@@ -1,13 +0,0 @@
-cytriangle/__init__.py,sha256=kEwfRnZoTHQyXpzGRGT2qSmCNuaFBLOSLXbSoSfTc6I,138
-cytriangle/ctriangle.pxd,sha256=YJL_UQqC-O6tccoYEz6uO02V7U3aqtv0B68K43g9Z9o,877
-cytriangle/cytriangle.c,sha256=q_9EXDXaN4frKaRxDepki05yVJcf3GdX7YQ7NVPB8xc,541778
-cytriangle/cytriangle.pyx,sha256=HobcOSGeQnaINMz7n20RpB3rI7guKXkTUt0KtAB7jzA,8703
-cytriangle/cytriangleio.c,sha256=tIpJ7nd1w1yxe6r8u2LwbvmW8lKn9ODsE3TkdUowG3g,910037
-cytriangle/cytriangleio.pxd,sha256=0SAPQZ3BVoYJrLoQG2oYjJVGaScgPGkTH9BaAeCsD68,122
-cytriangle/cytriangleio.pyx,sha256=gz3e2RLf3NGSMZiT5vhnHidyp9sw-mAcBsuyrAEYRm0,22249
-cytriangle/cytriangle.cpython-39-darwin.so,sha256=WtWr1Q7c1KehGidCxcxT-MWCmqPXtlewu9zzbWmKyLw,550928
-cytriangle/cytriangleio.cpython-39-darwin.so,sha256=DVuxTmUQYyBXRRUPmuPdMxOChn_YO2DNWBLqml_PMoo,700576
-cytriangle-1.0.1.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-cytriangle-1.0.1.dist-info/METADATA,sha256=XhuQwyABN4VeumJKkEpkDQDOfGX65J6Z_48g9uhh9TY,2000
-cytriangle-1.0.1.dist-info/WHEEL,sha256=G_WFxUbzDt1TgEo0jVMo4tP9Q2ZdlmLbhDg1HCJ0lsY,104
-cytriangle-1.0.1.dist-info/RECORD,,