Change boxsize into rectangular bounds

Author: terahlunah

benches/genvoronoi.rs

@@ -31,7 +31,7 @@ mod tests {
         let points = vec![Point::new(0.0, 1.0)];
 
         b.iter(|| {
-            voronoi(points.clone(), BOX_SIZE);
+            voronoi(points.clone(), (BOX_SIZE, BOX_SIZE));
         });
     }
 
@@ -40,7 +40,7 @@ mod tests {
         let points = generate_points(100);
 
         b.iter(|| {
-            voronoi(points.clone(), BOX_SIZE);
+            voronoi(points.clone(), (BOX_SIZE, BOX_SIZE));
         });
     }
 
@@ -50,7 +50,7 @@ mod tests {
         let points = generate_points(10000);
 
         b.iter(|| {
-            voronoi(points.clone(), BOX_SIZE);
+            voronoi(points.clone(), (BOX_SIZE, BOX_SIZE));
         });
     }
 }

src/lloyd.rs

@@ -14,8 +14,8 @@ pub fn polygon_centroid(pts: &Vec<Point>) -> Point {
 /// Produces the Lloyd Relaxation of a set of points.
 ///
 /// Each point is moved to the centroid of its Voronoi cell.
-pub fn lloyd_relaxation(pts: Vec<Point>, box_size: f64) -> Vec<Point> {
-    let voronoi = voronoi(pts, box_size);
+pub fn lloyd_relaxation(pts: Vec<Point>, bounds: (f64, f64)) -> Vec<Point> {
+    let voronoi = voronoi(pts, bounds);
     let faces = make_polygons(&voronoi);
     faces.iter().map(polygon_centroid).collect::<Vec<Point>>()
 }

src/voronoi.rs

@@ -8,7 +8,7 @@ type TripleSite = (Point, Point, Point);
 
 /// Computes the Voronoi diagram of a set of points.
 /// Returns a Doubly Connected Edge List.
-pub fn voronoi(points: Vec<Point>, boxsize: f64) -> DCEL {
+pub fn voronoi(points: Vec<Point>, bounds: (f64, f64)) -> DCEL {
     trace!("Starting Voronoi Computation");
     let mut event_queue = EventQueue::new();
     let mut beachline = BeachLine::new();
@@ -32,7 +32,7 @@ pub fn voronoi(points: Vec<Point>, boxsize: f64) -> DCEL {
             }
         }
     }
-    add_bounding_box(boxsize, &beachline, &mut result);
+    add_bounding_box(bounds, &beachline, &mut result);
     add_faces(&mut result);
     return result;
 }
@@ -259,19 +259,22 @@ fn handle_circle_event(
     }
 }
 
-fn outside_bb(pt: Point, box_size: f64) -> bool {
+fn outside_bb(pt: Point, bounds: (f64, f64)) -> bool {
     let delta = 0.1;
-    pt.x() < 0. - delta || pt.x() > box_size + delta || pt.y() < 0. - delta || pt.y() > box_size + delta
+    let (max_x, max_y) = bounds;
+    pt.x() < 0. - delta || pt.x() > max_x + delta || pt.y() < 0. - delta || pt.y() > max_y + delta
 }
 
-fn add_bounding_box(boxsize: f64, beachline: &BeachLine, dcel: &mut DCEL) {
+fn add_bounding_box(bounds: (f64, f64), beachline: &BeachLine, dcel: &mut DCEL) {
     extend_edges(beachline, dcel);
 
+    let (max_x, max_y) = bounds;
+
     let delta = 50.;
-    let bb_top =    [Point::new(0. - delta, 0.),         Point::new(boxsize + delta, 0.)];
-    let bb_bottom = [Point::new(0. - delta, boxsize),    Point::new(boxsize + delta, boxsize)];
-    let bb_left =   [Point::new(0.,         0. - delta), Point::new(0.,              boxsize + delta)];
-    let bb_right =  [Point::new(boxsize,    0. - delta), Point::new(boxsize,         boxsize + delta)];
+    let bb_top =    [Point::new(0. - delta, 0.),        Point::new(max_x + delta, 0.)];
+    let bb_bottom = [Point::new(0. - delta, max_y),        Point::new(max_x + delta, max_y)];
+    let bb_left =   [Point::new(0.,        0. - delta), Point::new(0.,            max_y + delta)];
+    let bb_right =  [Point::new(max_x,        0. - delta), Point::new(max_x,            max_y + delta)];
 
     add_line(bb_top, dcel);
     add_line(bb_right, dcel);
@@ -282,7 +285,7 @@ fn add_bounding_box(boxsize: f64, beachline: &BeachLine, dcel: &mut DCEL) {
 
     for vert in 0..dcel.vertices.len() {
         let this_pt = dcel.vertices[vert].coordinates;
-        if outside_bb(this_pt, boxsize) {
+        if outside_bb(this_pt, bounds) {
             dcel.remove_vertex(vert);
         }
     }