cytriangle 1.0.0__cp311-cp311-win_amd64.whl → 1.0.2__cp311-cp311-win_amd64.whl

cytriangle/cytriangle.pyx

@@ -1,4 +1,3 @@
-from cytriangle.ctriangle cimport triangulateio
 from cytriangle.ctriangle cimport triangulate as ctriangulate
 from cytriangle.cytriangleio  cimport TriangleIO
 import re
@@ -49,7 +48,7 @@ cdef class CyTriangle:
             self._in = TriangleIO(input_dict)
         else:
             self._in = TriangleIO()
-        self._out = TriangleIO(kind='out')
+        self._out = TriangleIO()
         self._vorout = TriangleIO()
 
     @property
@@ -75,23 +74,24 @@ cdef class CyTriangle:
 
     def validate_input_flags(self, opts):
         if "r" in opts:
-            if not 'triangles' in self._in.to_dict():
+            if 'triangles' not in self._in.to_dict():
                 raise ValueError("Triangle list must be provided when using 'r' flag")
         if "p" in opts:
-            if not 'segments' in self._in.to_dict():
+            if 'segments' not in self._in.to_dict():
                 raise ValueError("Segment list must be provided when using 'p' flag")
         if "a" in opts:
             if not ('triangle_max_area' in self._in.to_dict() or 'A'
-                    in opts or bool(re.search('a[\d.*.]+\d.*', opts))):
-                raise ValueError(f"""When using 'a' flag for area constraints, a global
+                    in opts or bool(re.search(r'a[\d.*.]+\d.*', opts))):
+                raise ValueError("""When using 'a' flag for area constraints, a global
                                  area flag (e.g. a0.2), 'A' flag, or local triangle area
                                  constraint list (e.g. [3.0, 1.0]) must be provided""")
         if "q" in opts:
-            if not bool(re.search('q[\d.*.]+\d.*', opts)):
-                raise ValueError("When using 'q' flag for minimum angles, an angle must be provided")
+            if not bool(re.search(r'q[\d.*.]+\d.*', opts)):
+                raise ValueError("""When using 'q' flag for minimum angles, an angle
+                                 must be provided""")
 
     # generic triangulation that accepts any switch
-    cpdef triangulate(self, triflags=''):
+    cpdef triangulate(self, triflags='', verbose=False):
         """
         Runs the main triangulation method on the in_ object with any additional
         user flags input as triflags.
@@ -121,27 +121,31 @@ cdef class CyTriangle:
         - Check the consistency and Delaunay property of the mesh (-C).
 
         """
-        if triflags: self.validate_input_flags(triflags)
-        opts = f"Qz{triflags}".encode('utf-8')
-        if ctriangulate(opts, self._in._io, self._out._io, self._vorout._io) is not None:
+        if triflags:
+            self.validate_input_flags(triflags)
+        opts = f"{'Q' if not verbose else 'V'}z{triflags}".encode('utf-8')
+        if ctriangulate(opts, self._in._io, self._out._io, self._vorout._io) \
+                is not None:
             raise RuntimeError('Triangulation failed')
         return self.out
 
-    cpdef delaunay(self):
+    cpdef delaunay(self, verbose=False):
         """
-        Run the main triangulation method on the in_ object with *only* -Qz flags enabled.
+        Run the main triangulation method on the in_ object with *only* -Qz
+        flags enabled.
 
         - Q Quiet: suppresses all output messages from Triangle library
 
         - z Numbers all items starting from zero (zero-indexed) rather than one.
 
         """
-        opts = "Qz".encode('utf-8')
-        if ctriangulate(opts, self._in._io, self._out._io, self._vorout._io) is not None:
+        opts = f"{'Q' if not verbose else 'V'}z".encode('utf-8')
+        if ctriangulate(opts, self._in._io, self._out._io, self._vorout._io) \
+                is not None:
             raise RuntimeError('Delaunay triangulation failed')
         return self.out
 
-    cpdef convex_hull(self):
+    cpdef convex_hull(self, verbose=False):
         """
         Run the main triangulation method on the in_ object with -Qzc flags enabled.
 
@@ -152,12 +156,14 @@ cdef class CyTriangle:
         - c Encloses the convex hull with segments
 
         """
-        opts = f"Qzc".encode('utf-8')
-        if ctriangulate(opts, self._in._io, self._out._io, self._vorout._io) is not None:
-            raise RuntimeError('Delaunay triangulation and convex hull construction failed')
+        opts = f"{'Q' if not verbose else 'V'}zc".encode('utf-8')
+        if ctriangulate(opts, self._in._io, self._out._io, self._vorout._io) \
+                is not None:
+            raise RuntimeError("""Delaunay triangulation and convex hull
+                               construction failed""")
         return self.out
 
-    cpdef voronoi(self):
+    cpdef voronoi(self, verbose=False):
         """
         Run the main triangulation method on the in_ object with -Qzv flags enabled.
 
@@ -168,11 +174,14 @@ cdef class CyTriangle:
         - v Generates a Voronoi diagram.
 
         """
-        opts = f"Qzv".encode('utf-8')
-        if ctriangulate(opts, self._in._io, self._out._io, self._vorout._io) is not None:
-            raise RuntimeError('Delaunay triangulation and generation of voronoi diagram failed')
+        opts = f"{'Q' if not verbose else 'V'}zv".encode('utf-8')
+        if ctriangulate(opts, self._in._io, self._out._io, self._vorout._io) \
+                is not None:
+            raise RuntimeError("""Delaunay triangulation and generation of
+                               voronoi diagram failed""")
         return self.out
 
+
 def triangulate(input_dict, flags):
     """
     Triangulates an input dict with the following properties: