Add iai

Author: addisoncrump

.gitignore

@@ -1,3 +1,3 @@
-/target
+target/
 .idea/
 *.iml

Cargo.lock

@@ -8,6 +8,14 @@ edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[dev-dependencies]
+iai = "0.1"
+
+[[bench]]
+name = "iai"
+harness = false
+path = "src/iai.rs"
+
 [dependencies]
 arrayvec = "0.7"
 derive_more = "0.99"

tiling/Cargo.toml

@@ -0,0 +1,60 @@
+use euclid::default::Point2D;
+
+use euclid::default::Box2D;
+use iai::black_box;
+use penrose_tiling::{compute_area, FiveFold, MatchList};
+
+fn render(bounds: &Box2D<f64>, mut plane: FiveFold) -> MatchList {
+    compute_area(&mut plane, bounds)
+}
+
+fn ace() {
+    let plane = FiveFold::ace_configuration();
+    let bounds = Box2D::new(Point2D::new(-8., -4.), Point2D::new(8., 4.));
+
+    render(&bounds, black_box(plane));
+}
+
+fn deuce() {
+    let plane = FiveFold::deuce_configuration();
+    let bounds = Box2D::new(Point2D::new(-40., -20.), Point2D::new(40., 20.));
+
+    render(&bounds, black_box(plane));
+}
+
+fn sun() {
+    let plane = FiveFold::sun_configuration();
+    let bounds = Box2D::new(Point2D::new(-14., -7.), Point2D::new(14., 7.));
+
+    render(&bounds, black_box(plane));
+}
+
+fn star() {
+    let plane = FiveFold::star_configuration();
+    let bounds = Box2D::new(Point2D::new(-40., -20.), Point2D::new(40., 20.));
+
+    render(&bounds, black_box(plane));
+}
+
+fn jack() {
+    let plane = FiveFold::jack_configuration();
+    let bounds = Box2D::new(Point2D::new(-40., -20.), Point2D::new(40., 20.));
+
+    render(&bounds, black_box(plane));
+}
+
+fn queen() {
+    let plane = FiveFold::queen_configuration();
+    let bounds = Box2D::new(Point2D::new(-40., -20.), Point2D::new(40., 20.));
+
+    render(&bounds, black_box(plane));
+}
+
+fn king() {
+    let plane = FiveFold::king_configuration();
+    let bounds = Box2D::new(Point2D::new(-40., -20.), Point2D::new(40., 20.));
+
+    render(&bounds, black_box(plane));
+}
+
+iai::main!(ace, deuce, sun, star, jack, queen, king);

tiling/src/iai.rs

@@ -63,111 +63,3 @@ pub fn compute_area(plane: &mut FiveFold, bounds: &Box2D<f64>) -> MatchList {
 
     MatchList { kites, darts }
 }
-
-#[cfg(test)]
-mod test {
-    use std::io::Write;
-
-    use euclid::default::Point2D;
-
-    use crate::shape::Shape;
-
-    use super::*;
-
-    fn show_matches(bounds: &Box2D<f64>, mut plane: FiveFold) {
-        let matches = compute_area(&mut plane, &bounds);
-
-        let y_range = bounds.max.y - bounds.min.y;
-        let x_range = bounds.max.x - bounds.min.x;
-
-        let y_step = y_range / 50f64;
-        let x_step = x_range / 200f64;
-        let y_center = (bounds.max.y + bounds.min.y + y_step) / 2f64;
-        let x_center = (bounds.max.x + bounds.min.x + x_step) / 2f64;
-
-        let mut res = String::from("\n");
-        for y in -25..25 {
-            for x in -100..100 {
-                let point =
-                    Point2D::new(x as f64 * x_step + x_center, y as f64 * y_step + y_center);
-
-                if matches.kites.iter().any(|kite| kite.contains(point)) {
-                    res += "X";
-                } else if matches.darts.iter().any(|dart| dart.contains(point)) {
-                    res += ":"
-                } else {
-                    res += " ";
-                }
-            }
-            res += "\n";
-        }
-        res += "\n";
-        let stdout = std::io::stdout();
-        let mut lock = stdout.lock();
-        lock.write_all(res.as_bytes()).unwrap();
-        lock.flush().unwrap();
-    }
-
-    #[test]
-    #[ignore]
-    fn ace() {
-        let plane = FiveFold::ace_configuration();
-        let bounds = Box2D::new(Point2D::new(-8., -4.), Point2D::new(8., 4.));
-
-        show_matches(&bounds, plane);
-    }
-
-    #[test]
-    #[ignore]
-    fn deuce() {
-        let plane = FiveFold::deuce_configuration();
-        let bounds = Box2D::new(Point2D::new(-40., -20.), Point2D::new(40., 20.));
-
-        show_matches(&bounds, plane);
-    }
-
-    #[test]
-    #[ignore]
-    fn sun() {
-        let plane = FiveFold::sun_configuration();
-        let bounds = Box2D::new(Point2D::new(-14., -7.), Point2D::new(14., 7.));
-
-        show_matches(&bounds, plane);
-    }
-
-    #[test]
-    #[ignore]
-    fn star() {
-        let plane = FiveFold::star_configuration();
-        let bounds = Box2D::new(Point2D::new(-40., -20.), Point2D::new(40., 20.));
-
-        show_matches(&bounds, plane);
-    }
-
-    #[test]
-    #[ignore]
-    fn jack() {
-        let plane = FiveFold::jack_configuration();
-        let bounds = Box2D::new(Point2D::new(-40., -20.), Point2D::new(40., 20.));
-
-        show_matches(&bounds, plane);
-    }
-
-    #[test]
-    #[ignore]
-    fn queen() {
-        let plane = FiveFold::queen_configuration();
-        let bounds = Box2D::new(Point2D::new(-40., -20.), Point2D::new(40., 20.));
-
-        show_matches(&bounds, plane);
-    }
-
-    #[test]
-    #[ignore]
-    fn king() {
-        let plane = FiveFold::king_configuration();
-        let bounds = Box2D::new(Point2D::new(-40., -20.), Point2D::new(40., 20.));
-
-        show_matches(&bounds, plane);
-    }
-}

tiling/src/lib.rs

@@ -43,6 +43,13 @@ fn ddist(shorts: BarNumber, longs: BarNumber, distance: f64) -> f64 {
 }
 
 impl MusicalSequence {
+    fn new() -> Self {
+        MusicalSequence {
+            upper_y: 1,
+            ..Default::default()
+        }
+    }
+
     pub(crate) fn new_with_coords(x: f64, y: f64, r: f64) -> Self {
         MusicalSequence {
             upper_y: 1,