Fix traits to be consistent across Vertex, Cell, Facet, Tds

Also debug Bowyer-Watson. Still getting Singular matrices.

Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 nalgebra = "0.32.3"
 num-traits = "0.2.17"
-serde = { version = "1.0.194", features = ["derive"] }
+serde = { version = "1.0.195", features = ["derive"] }
 serde_json = "1.0.111" 
 serde_test = "1.0.176"
 uuid = { version = "1.6.1", features = ["v4", "fast-rng", "macro-diagnostics", "serde"] }

src/delaunay_core/cell.rs

@@ -28,8 +28,8 @@ use uuid::Uuid;
 pub struct Cell<T: Clone + Copy + Default, U, V, const D: usize>
 where
     [T; D]: Default + DeserializeOwned + Serialize + Sized,
-    U: Clone + Copy,
-    V: Clone + Copy,
+    U: Clone + Copy + PartialEq,
+    V: Clone + Copy + PartialEq,
 {
     /// The vertices of the cell.
     pub vertices: Vec<Vertex<T, U, D>>,
@@ -47,8 +47,8 @@ where
     for<'a> &'a T: Div<f64>,
     f64: From<T>,
     [T; D]: Default + DeserializeOwned + Serialize + Sized,
-    U: Clone + Copy,
-    V: Clone + Copy,
+    U: Clone + Copy + PartialEq,
+    V: Clone + Copy + PartialEq,
 {
     /// The function `new` creates a new `Cell`` object with the given
     /// vertices. A D-dimensional cell has D + 1 vertices, so the number of

src/delaunay_core/facet.rs

@@ -24,8 +24,8 @@ use serde::{de::DeserializeOwned, Deserialize, Serialize};
 pub struct Facet<T: Clone + Copy + Default, U, V, const D: usize>
 where
     [T; D]: Default + DeserializeOwned + Serialize + Sized,
-    U: Clone + Copy,
-    V: Clone + Copy,
+    U: Clone + Copy + PartialEq,
+    V: Clone + Copy + PartialEq,
 {
     /// The `Cell` that contains this facet.
     pub cell: Cell<T, U, V, D>,
@@ -39,7 +39,7 @@ where
     T: Copy + Default + PartialEq,
     [T; D]: Default + DeserializeOwned + Serialize + Sized,
     U: Clone + Copy + PartialEq,
-    V: Clone + Copy,
+    V: Clone + Copy + PartialEq,
 {
     /// The `new` function is a constructor for the `Facet` struct. It takes
     /// in a `Cell` and a `Vertex` as arguments and returns a `Result`

src/delaunay_core/triangulation_data_structure.rs

@@ -46,8 +46,8 @@ use uuid::Uuid;
 pub struct Tds<T: Clone + Copy + Default, U, V, const D: usize>
 where
     [T; D]: Default + DeserializeOwned + Serialize + Sized,
-    U: Clone + Copy,
-    V: Clone + Copy,
+    U: Clone + Copy + PartialEq,
+    V: Clone + Copy + PartialEq,
 {
     /// A `HashMap` that stores vertices with their corresponding `Uuid`s as
     /// keys. Each `Vertex` has a `Point` of type T, vertex data of type U,
@@ -267,15 +267,15 @@ where
 
         // Create super-cell that contains all vertices
         let supercell = self.supercell()?;
-        cells.push(supercell);
+        cells.push(supercell.clone());
 
         // Iterate over vertices
         for vertex in self.vertices.values() {
             // Find cells that contain the vertex
             let mut bad_cells: Vec<Cell<T, U, V, D>> = Vec::new();
             for cell in cells.iter() {
                 // TODO: understand why we're getting singular matrices here
-                if cell.circumsphere_contains(*vertex).unwrap() {
+                if cell.circumsphere_contains(*vertex)? {
                     bad_cells.push((*cell).clone());
                 }
             }
@@ -285,7 +285,7 @@ where
             for cell in bad_cells.iter() {
                 // Create `Facet`s from the `Cell`
                 for vertex in cell.vertices.iter() {
-                    let facet = Facet::new(cell.clone(), *vertex).unwrap();
+                    let facet = Facet::new(cell.clone(), *vertex)?;
                     polygonal_hole.push(facet);
                 }
 
@@ -317,12 +317,8 @@ where
         }
 
         // Remove all cells containing vertices from the supercell
-        // TODO: Fix borrow-checker errors
-        // for cell in cells.iter_mut() {
-        //     if cell.contains_vertex(supercell.vertices[0]) {
-        //         cells.remove(cells.iter().position(|c| c == cell).unwrap());
-        //     }
-        // }
+        cells
+            .retain(|c| !c.contains_vertex(supercell.vertices.clone().into_iter().next().unwrap()));
 
         Ok(cells)
     }
@@ -453,15 +449,14 @@ mod tests {
     #[test]
     fn tds_bowyer_watson() {
         let points = vec![
-            Point::new([0.0, 0.0, 0.0]),
+            Point::new([1.0, 1.0, 1.0]),
             Point::new([1.0, 0.0, 0.0]),
             Point::new([0.0, 1.0, 0.0]),
             Point::new([0.0, 0.0, 1.0]),
         ];
         let mut tds: Tds<f64, usize, usize, 3> = Tds::new(points);
         let cells = tds.bowyer_watson();
-        let unwrapped_cells =
-            cells.unwrap_or_else(|err| panic!("Error creating cells: {:?}!", err));
+        let unwrapped_cells = cells.unwrap_or_else(|err| panic!("Error creating cells: {:?}", err));
 
         assert_eq!(unwrapped_cells.len(), 1);
 

src/delaunay_core/utilities.rs

@@ -67,7 +67,7 @@ pub fn find_extreme_coordinates<T, U, const D: usize>(
 where
     T: Clone + Copy + Default + PartialOrd,
     [T; D]: Default + DeserializeOwned + Serialize + Sized,
-    U: Clone + Copy,
+    U: Clone + Copy + PartialEq,
 {
     let mut min_coords = [Default::default(); D];
 

src/delaunay_core/vertex.rs

@@ -25,7 +25,7 @@ use uuid::Uuid;
 pub struct Vertex<T: Clone + Copy + Default, U, const D: usize>
 where
     [T; D]: Default + DeserializeOwned + Serialize + Sized,
-    U: Clone + Copy,
+    U: Clone + Copy + PartialEq,
 {
     /// The coordinates of the vertex in a D-dimensional space.
     pub point: Point<T, D>,
@@ -40,7 +40,7 @@ where
 impl<T: Clone + Copy + Default, U, const D: usize> Vertex<T, U, D>
 where
     [T; D]: Default + DeserializeOwned + Serialize + Sized,
-    U: Clone + Copy,
+    U: Clone + Copy + PartialEq,
 {
     /// The function creates a new instance of a `Vertex`.
     ///