rust/integral-geometry/src/lib.rs
author alfadur
Tue, 30 Oct 2018 05:55:58 +0300
changeset 14036 c47283feafac
parent 13955 48796bef9e69
child 14037 2869c2ccb1b8
permissions -rw-r--r--
add circle filling to land2d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
     1
use std::cmp;
13946
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
     2
use std::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Sub, SubAssign};
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
     3
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
     4
#[derive(PartialEq, Eq, Clone, Copy, Debug)]
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
     5
pub struct Point {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
     6
    pub x: i32,
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
     7
    pub y: i32,
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
     8
}
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
     9
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    10
impl Point {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    11
    #[inline]
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    12
    pub fn new(x: i32, y: i32) -> Self {
13946
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
    13
        Self { x, y }
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    14
    }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    15
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    16
    #[inline]
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    17
    pub fn zero() -> Self {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    18
        Self::new(0, 0)
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    19
    }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    20
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    21
    #[inline]
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    22
    pub fn signum(self) -> Self {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    23
        Self::new(self.x.signum(), self.y.signum())
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    24
    }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    25
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    26
    #[inline]
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    27
    pub fn abs(self) -> Self {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    28
        Self::new(self.x.abs(), self.y.abs())
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    29
    }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    30
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    31
    #[inline]
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    32
    pub fn dot(self, other: Point) -> i32 {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    33
        self.x * other.x + self.y * other.y
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    34
    }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    35
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    36
    #[inline]
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    37
    pub fn max_norm(self) -> i32 {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    38
        std::cmp::max(self.x.abs(), self.y.abs())
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    39
    }
14036
c47283feafac add circle filling to land2d
alfadur
parents: 13955
diff changeset
    40
c47283feafac add circle filling to land2d
alfadur
parents: 13955
diff changeset
    41
    #[inline]
c47283feafac add circle filling to land2d
alfadur
parents: 13955
diff changeset
    42
    pub fn transform(self, matrix: &[i32; 4]) -> Self {
c47283feafac add circle filling to land2d
alfadur
parents: 13955
diff changeset
    43
        Point::new(matrix[0] * self.x + matrix[1] * self.y,
c47283feafac add circle filling to land2d
alfadur
parents: 13955
diff changeset
    44
                   matrix[2] * self.x + matrix[3] * self.y)
c47283feafac add circle filling to land2d
alfadur
parents: 13955
diff changeset
    45
    }
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    46
}
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    47
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    48
macro_rules! bin_op_impl {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    49
    ($op: ty, $name: tt) => {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    50
        impl $op for Point {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    51
            type Output = Self;
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    52
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    53
            #[inline]
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    54
            fn $name(self, rhs: Self) -> Self::Output {
13946
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
    55
                Self::new(self.x.$name(rhs.x), self.y.$name(rhs.y))
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    56
            }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    57
        }
13946
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
    58
    };
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    59
}
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    60
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    61
macro_rules! bin_assign_op_impl {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    62
    ($op: ty, $name: tt) => {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    63
        impl $op for Point {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    64
            #[inline]
13946
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
    65
            fn $name(&mut self, rhs: Self) {
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    66
                self.x.$name(rhs.x);
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    67
                self.y.$name(rhs.y);
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    68
            }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    69
        }
13946
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
    70
    };
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    71
}
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    72
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    73
bin_op_impl!(Add, add);
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    74
bin_op_impl!(Sub, sub);
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    75
bin_op_impl!(Mul, mul);
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    76
bin_op_impl!(Div, div);
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    77
bin_assign_op_impl!(AddAssign, add_assign);
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    78
bin_assign_op_impl!(SubAssign, sub_assign);
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    79
bin_assign_op_impl!(MulAssign, mul_assign);
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    80
bin_assign_op_impl!(DivAssign, div_assign);
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
    81
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
    82
pub struct LinePoints {
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    83
    accumulator: Point,
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    84
    direction: Point,
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    85
    sign: Point,
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    86
    current: Point,
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    87
    total_steps: i32,
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    88
    step: i32,
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
    89
}
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
    90
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
    91
impl LinePoints {
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    92
    pub fn new(from: Point, to: Point) -> Self {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    93
        let dir = to - from;
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
    94
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
    95
        Self {
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    96
            accumulator: Point::zero(),
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    97
            direction: dir.abs(),
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    98
            sign: dir.signum(),
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    99
            current: from,
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   100
            total_steps: dir.max_norm(),
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   101
            step: 0,
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   102
        }
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   103
    }
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   104
}
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   105
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   106
impl Iterator for LinePoints {
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   107
    type Item = Point;
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   108
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   109
    fn next(&mut self) -> Option<Self::Item> {
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   110
        if self.step <= self.total_steps {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   111
            self.accumulator += self.direction;
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   112
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   113
            if self.accumulator.x > self.total_steps {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   114
                self.accumulator.x -= self.total_steps;
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   115
                self.current.x += self.sign.x;
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   116
            }
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   117
            if self.accumulator.y > self.total_steps {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   118
                self.accumulator.y -= self.total_steps;
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   119
                self.current.y += self.sign.y;
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   120
            }
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   121
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   122
            self.step += 1;
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   123
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   124
            Some(self.current)
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   125
        } else {
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   126
            None
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   127
        }
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   128
    }
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   129
}
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   130
13946
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   131
pub struct ArcPoints {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   132
    point: Point,
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   133
    step: i32,
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   134
}
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   135
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   136
impl ArcPoints {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   137
    pub fn new(radius: i32) -> Self {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   138
        Self {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   139
            point: Point::new(0, radius),
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   140
            step: 3 - 2 * radius,
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   141
        }
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   142
    }
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   143
}
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   144
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   145
impl Iterator for ArcPoints {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   146
    type Item = Point;
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   147
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   148
    fn next(&mut self) -> Option<Self::Item> {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   149
        if self.point.x < self.point.y {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   150
            let result = self.point;
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   151
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   152
            if self.step < 0 {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   153
                self.step += self.point.x * 4 + 6;
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   154
            } else {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   155
                self.step += (self.point.x - self.point.y) * 4 + 10;
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   156
                self.point.y -= 1;
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   157
            }
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   158
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   159
            self.point.x += 1;
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   160
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   161
            Some(result)
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   162
        } else if self.point.x == self.point.y {
13952
85645992bc8a Fix ArcPoints never finishing
unc0rr
parents: 13948
diff changeset
   163
            self.point.x += 1;
13955
48796bef9e69 Add --protocol option to engine
unc0rr
parents: 13952
diff changeset
   164
13946
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   165
            Some(self.point)
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   166
        } else {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   167
            None
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   168
        }
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   169
    }
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   170
}
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   171
13947
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   172
pub struct EquidistantPoints {
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   173
    vector: Point,
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   174
    iteration: u8,
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   175
}
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   176
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   177
impl EquidistantPoints {
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   178
    pub fn new(vector: Point) -> Self {
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   179
        Self {
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   180
            vector,
13948
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13947
diff changeset
   181
            iteration: if vector.x == vector.y { 4 } else { 8 },
13947
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   182
        }
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   183
    }
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   184
}
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   185
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   186
impl Iterator for EquidistantPoints {
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   187
    type Item = Point;
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   188
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   189
    fn next(&mut self) -> Option<Self::Item> {
13948
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13947
diff changeset
   190
        if self.iteration > 0 {
13947
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   191
            self.vector.x = -self.vector.x;
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   192
            if self.iteration & 1 == 0 {
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   193
                self.vector.y = -self.vector.y;
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   194
            }
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   195
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   196
            if self.iteration == 4 {
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   197
                std::mem::swap(&mut self.vector.x, &mut self.vector.y);
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   198
            }
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   199
13948
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13947
diff changeset
   200
            self.iteration -= 1;
13947
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   201
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   202
            Some(self.vector)
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   203
        } else {
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   204
            None
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   205
        }
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   206
    }
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   207
}
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   208
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   209
#[cfg(test)]
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   210
mod tests {
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   211
    use super::*;
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   212
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   213
    fn get_points(coords: &[(i32, i32)]) -> Vec<Point> {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   214
        coords.iter().map(|(x, y)| Point::new(*x, *y)).collect()
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   215
    }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   216
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   217
    #[test]
13947
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   218
    fn line_basic() {
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   219
        let line = LinePoints::new(Point::new(0, 0), Point::new(3, 3));
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   220
        let v = get_points(&[(0, 0), (1, 1), (2, 2), (3, 3), (123, 456)]);
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   221
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   222
        for (&a, b) in v.iter().zip(line) {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   223
            assert_eq!(a, b);
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   224
        }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   225
    }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   226
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   227
    #[test]
13947
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   228
    fn line_skewed() {
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   229
        let line = LinePoints::new(Point::new(0, 0), Point::new(5, -7));
13946
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   230
        let v = get_points(&[
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   231
            (0, 0),
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   232
            (1, -1),
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   233
            (2, -2),
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   234
            (2, -3),
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   235
            (3, -4),
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   236
            (4, -5),
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   237
            (4, -6),
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   238
            (5, -7),
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   239
        ]);
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   240
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   241
        for (&a, b) in v.iter().zip(line) {
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   242
            assert_eq!(a, b);
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   243
        }
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   244
    }
13947
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   245
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   246
    #[test]
13948
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13947
diff changeset
   247
    fn equidistant_full() {
13947
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   248
        let n = EquidistantPoints::new(Point::new(1, 3));
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   249
        let v = get_points(&[
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   250
            (-1, -3),
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   251
            (1, -3),
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   252
            (-1, 3),
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   253
            (1, 3),
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   254
            (-3, -1),
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   255
            (3, -1),
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   256
            (-3, 1),
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   257
            (3, 1),
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   258
            (123, 456),
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   259
        ]);
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   260
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   261
        for (&a, b) in v.iter().zip(n) {
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   262
            assert_eq!(a, b);
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   263
        }
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   264
    }
13948
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13947
diff changeset
   265
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13947
diff changeset
   266
    #[test]
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13947
diff changeset
   267
    fn equidistant_half() {
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13947
diff changeset
   268
        let n = EquidistantPoints::new(Point::new(2, 2));
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13947
diff changeset
   269
        let v = get_points(&[(-2, -2), (2, -2), (-2, 2), (2, 2), (123, 456)]);
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13947
diff changeset
   270
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13947
diff changeset
   271
        for (&a, b) in v.iter().zip(n) {
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13947
diff changeset
   272
            assert_eq!(a, b);
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13947
diff changeset
   273
        }
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13947
diff changeset
   274
    }
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   275
}