Refactor grid stuff into modules
This commit is contained in:
parent
804345629a
commit
a2bee8300b
|
@ -59,7 +59,7 @@ fn parse_input(raw: &str) -> Parsed {
|
||||||
|
|
||||||
#[inline]
|
#[inline]
|
||||||
fn occupied_neighbors(pos: &Position2D, grid: &Parsed) -> usize {
|
fn occupied_neighbors(pos: &Position2D, grid: &Parsed) -> usize {
|
||||||
pos.moore()
|
pos.neighbors()
|
||||||
.iter()
|
.iter()
|
||||||
.filter(|p| grid.get(&p).unwrap_or(&Tile::Floor) == &Tile::Occupied)
|
.filter(|p| grid.get(&p).unwrap_or(&Tile::Floor) == &Tile::Occupied)
|
||||||
.count()
|
.count()
|
||||||
|
|
|
@ -27,6 +27,7 @@ fn part1(initial: &Parsed, limit: usize) -> usize {
|
||||||
}
|
}
|
||||||
|
|
||||||
// only here so the test/bench macro works
|
// only here so the test/bench macro works
|
||||||
|
#[allow(unused)]
|
||||||
#[inline]
|
#[inline]
|
||||||
fn part2(parsed: &Parsed, limit: usize) -> usize {
|
fn part2(parsed: &Parsed, limit: usize) -> usize {
|
||||||
part1(parsed, limit)
|
part1(parsed, limit)
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
#![feature(test)]
|
#![feature(test)]
|
||||||
extern crate test;
|
extern crate test;
|
||||||
use aoc2020::{common::*, grid::*};
|
use aoc2020::{
|
||||||
|
common::*, grid::{cell::Cell, *}
|
||||||
|
};
|
||||||
|
|
||||||
type Parsed = Grid<Position3D, Cell>;
|
type Parsed = Grid<Position3D, Cell>;
|
||||||
|
|
||||||
|
|
231
2020/src/grid.rs
231
2020/src/grid.rs
|
@ -1,80 +1,18 @@
|
||||||
use impl_ops::*;
|
pub mod cell;
|
||||||
use itertools::{iproduct, join, Itertools};
|
pub mod direction;
|
||||||
use std::{
|
pub mod position;
|
||||||
collections::HashMap, convert::TryInto, fmt::{self, Display, Formatter}, hash::{BuildHasher, Hash}, ops, ops::AddAssign
|
pub use direction::*;
|
||||||
};
|
pub use position::*;
|
||||||
|
|
||||||
#[derive(Hash, PartialEq, Eq, Debug, Clone, Copy)]
|
use itertools::join;
|
||||||
pub struct Position2D {
|
use std::{collections::HashMap, fmt::Display, hash::BuildHasher};
|
||||||
pub x: i64,
|
|
||||||
pub y: i64,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Hash, PartialEq, Eq, Debug, Clone, Copy)]
|
|
||||||
pub struct Position3D {
|
|
||||||
pub x: i64,
|
|
||||||
pub y: i64,
|
|
||||||
pub z: i64,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Position3D {
|
|
||||||
pub fn neighbors(&self) -> Vec<Position3D> {
|
|
||||||
iproduct!((-1..=1), (-1..=1), (-1..=1))
|
|
||||||
.filter(|t| t != &(0, 0, 0))
|
|
||||||
.map(|(x, y, z)| *self + Position3D::from((x, y, z)))
|
|
||||||
.collect()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug)]
|
|
||||||
pub enum Direction {
|
|
||||||
Up,
|
|
||||||
Down,
|
|
||||||
Left,
|
|
||||||
Right,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Hash, PartialEq, Eq, Debug, Clone, Copy)]
|
|
||||||
pub enum Cell {
|
|
||||||
Alive,
|
|
||||||
Dead,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl From<u8> for Cell {
|
|
||||||
fn from(b: u8) -> Self {
|
|
||||||
match b {
|
|
||||||
b'.' => Cell::Dead,
|
|
||||||
b'#' => Cell::Alive,
|
|
||||||
_ => unreachable!(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Display for Cell {
|
|
||||||
fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
|
|
||||||
f.write_str(match self {
|
|
||||||
Cell::Alive => ".",
|
|
||||||
Cell::Dead => "#",
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Default for Cell {
|
|
||||||
fn default() -> Self {
|
|
||||||
Cell::Dead
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub trait Position {}
|
|
||||||
impl Position for Position2D {}
|
|
||||||
impl Position for Position3D {}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub struct Grid<P: Position, T: Display + Default> {
|
pub struct Grid<P: Position, T: Display + Default> {
|
||||||
pub fields: HashMap<P, T>,
|
pub fields: HashMap<P, T>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<P: Position + Eq + Hash, T: Display + Default + Copy> Grid<P, T> {
|
impl<P: Position, T: Display + Default + Copy> Grid<P, T> {
|
||||||
pub fn get<Pos: Into<P>>(&self, pos: Pos) -> T {
|
pub fn get<Pos: Into<P>>(&self, pos: Pos) -> T {
|
||||||
self.fields.get(&pos.into()).copied().unwrap_or_else(|| T::default())
|
self.fields.get(&pos.into()).copied().unwrap_or_else(|| T::default())
|
||||||
}
|
}
|
||||||
|
@ -84,7 +22,7 @@ impl<P: Position + Eq + Hash, T: Display + Default + Copy> Grid<P, T> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<P: Position + Hash + Eq, T: Display + Default> std::iter::FromIterator<(P, T)> for Grid<P, T> {
|
impl<P: Position, T: Display + Default> std::iter::FromIterator<(P, T)> for Grid<P, T> {
|
||||||
fn from_iter<I: IntoIterator<Item = (P, T)>>(iter: I) -> Self {
|
fn from_iter<I: IntoIterator<Item = (P, T)>>(iter: I) -> Self {
|
||||||
Grid {
|
Grid {
|
||||||
fields: iter.into_iter().collect(),
|
fields: iter.into_iter().collect(),
|
||||||
|
@ -98,8 +36,6 @@ impl<T: Display + Default + Copy> Grid<Position2D, T> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub const ALL_DIRECTIONS: [Direction; 4] = [Direction::Up, Direction::Down, Direction::Left, Direction::Right];
|
|
||||||
|
|
||||||
struct Boundaries {
|
struct Boundaries {
|
||||||
x_min: i64,
|
x_min: i64,
|
||||||
x_max: i64,
|
x_max: i64,
|
||||||
|
@ -128,155 +64,6 @@ pub fn draw_ascii<T: Display + Default, S: BuildHasher>(coordinates: &HashMap<Po
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Position2D {
|
|
||||||
pub fn neighbors(&self) -> [(Direction, Position2D); 4] {
|
|
||||||
[
|
|
||||||
(Direction::Up, *self + Direction::Up),
|
|
||||||
(Direction::Down, *self + Direction::Down),
|
|
||||||
(Direction::Right, *self + Direction::Right),
|
|
||||||
(Direction::Left, *self + Direction::Left),
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn moore(&self) -> [Position2D; 8] {
|
|
||||||
[
|
|
||||||
*self + Direction::Up + Direction::Left,
|
|
||||||
*self + Direction::Up,
|
|
||||||
*self + Direction::Up + Direction::Right,
|
|
||||||
*self + Direction::Left,
|
|
||||||
*self + Direction::Right,
|
|
||||||
*self + Direction::Down + Direction::Left,
|
|
||||||
*self + Direction::Down,
|
|
||||||
*self + Direction::Down + Direction::Right,
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Direction {
|
|
||||||
pub fn turn(&mut self, turn_value: i64) {
|
|
||||||
*self += turn_value as i8;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl From<Direction> for Position2D {
|
|
||||||
fn from(d: Direction) -> Self {
|
|
||||||
match d {
|
|
||||||
Direction::Up => Position2D::from((0, 1)),
|
|
||||||
Direction::Right => Position2D::from((1, 0)),
|
|
||||||
Direction::Left => Position2D::from((-1, 0)),
|
|
||||||
Direction::Down => Position2D::from((0, -1)),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl_op!(+ |a: Direction, b: i8| -> Direction {
|
|
||||||
match b {
|
|
||||||
-1 | 3 => match a {
|
|
||||||
Direction::Up => Direction::Left,
|
|
||||||
Direction::Right => Direction::Up,
|
|
||||||
Direction::Down => Direction::Right,
|
|
||||||
Direction::Left => Direction::Down,
|
|
||||||
},
|
|
||||||
1 | -3 => match a {
|
|
||||||
Direction::Up => Direction::Right,
|
|
||||||
Direction::Right => Direction::Down,
|
|
||||||
Direction::Down => Direction::Left,
|
|
||||||
Direction::Left => Direction::Up,
|
|
||||||
},
|
|
||||||
0 | 4 | -4 => a,
|
|
||||||
2 | -2 => match a {
|
|
||||||
Direction::Up => Direction::Down,
|
|
||||||
Direction::Right => Direction::Left,
|
|
||||||
Direction::Down => Direction::Up,
|
|
||||||
Direction::Left => Direction::Right,
|
|
||||||
},
|
|
||||||
n => unreachable!(format!("Illegal turn value: {}", n)),
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
impl_op!(+|a: Position2D, b: Position2D| -> Position2D {
|
|
||||||
Position2D {
|
|
||||||
x: a.x + b.x,
|
|
||||||
y: a.y + b.y
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
impl_op!(-|a: Position2D, b: Position2D| -> Position2D {
|
|
||||||
Position2D {
|
|
||||||
x: a.x - b.x,
|
|
||||||
y: a.y - b.y,
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
impl_op!(-|a: Position3D, b: Position3D| -> Position3D {
|
|
||||||
Position3D {
|
|
||||||
x: a.x - b.x,
|
|
||||||
y: a.y - b.y,
|
|
||||||
z: a.z - b.z,
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
impl_op!(+|a: Position3D, b: Position3D| -> Position3D {
|
|
||||||
Position3D {
|
|
||||||
x: a.x + b.x,
|
|
||||||
y: a.y + b.y,
|
|
||||||
z: a.z + b.z,
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
impl_op!(+|a: Position2D, b: Direction| -> Position2D {
|
|
||||||
a + Position2D::from(b)
|
|
||||||
});
|
|
||||||
|
|
||||||
impl_op!(-|a: Position2D, b: Direction| -> Position2D { a - Position2D::from(b) });
|
|
||||||
|
|
||||||
impl_op!(*|a: Position2D, b: i64| -> Position2D { Position2D { x: a.x * b, y: a.y * b } });
|
|
||||||
|
|
||||||
impl AddAssign<i8> for Direction {
|
|
||||||
fn add_assign(&mut self, rhs: i8) {
|
|
||||||
*self = *self + rhs;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl AddAssign<Direction> for Position2D {
|
|
||||||
fn add_assign(&mut self, rhs: Direction) {
|
|
||||||
*self = *self + rhs;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl AddAssign for Position2D {
|
|
||||||
fn add_assign(&mut self, rhs: Position2D) {
|
|
||||||
*self = *self + rhs;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<I> From<(I, I, I)> for Position3D
|
|
||||||
where I: TryInto<i64>
|
|
||||||
{
|
|
||||||
fn from((x, y, z): (I, I, I)) -> Position3D {
|
|
||||||
Position3D {
|
|
||||||
x: unwrap_number_result(x),
|
|
||||||
y: unwrap_number_result(y),
|
|
||||||
z: unwrap_number_result(z),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// because calling .unwrap() on a TryInto result isn’t possible without trait bounds on the
|
|
||||||
// associated Error type.
|
|
||||||
fn unwrap_number_result<I: TryInto<i64>>(i: I) -> i64 {
|
|
||||||
match i.try_into() {
|
|
||||||
Ok(i) => return i,
|
|
||||||
_ => panic!("Bad coordinate"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<I: Into<i64>> From<(I, I)> for Position2D {
|
|
||||||
fn from((x, y): (I, I)) -> Position2D {
|
|
||||||
Position2D { x: x.into(), y: y.into() }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
|
@ -0,0 +1,34 @@
|
||||||
|
use std::{
|
||||||
|
fmt::{self, Display, Formatter}, hash::Hash
|
||||||
|
};
|
||||||
|
|
||||||
|
#[derive(Hash, PartialEq, Eq, Debug, Clone, Copy)]
|
||||||
|
pub enum Cell {
|
||||||
|
Alive,
|
||||||
|
Dead,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<u8> for Cell {
|
||||||
|
fn from(b: u8) -> Self {
|
||||||
|
match b {
|
||||||
|
b'.' => Cell::Dead,
|
||||||
|
b'#' => Cell::Alive,
|
||||||
|
_ => unreachable!(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Display for Cell {
|
||||||
|
fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
|
||||||
|
f.write_str(match self {
|
||||||
|
Cell::Alive => ".",
|
||||||
|
Cell::Dead => "#",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for Cell {
|
||||||
|
fn default() -> Self {
|
||||||
|
Cell::Dead
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,49 @@
|
||||||
|
use impl_ops::*;
|
||||||
|
use std::{ops, ops::AddAssign};
|
||||||
|
|
||||||
|
pub const ALL_DIRECTIONS: [Direction; 4] = [Direction::Up, Direction::Down, Direction::Left, Direction::Right];
|
||||||
|
|
||||||
|
#[derive(Clone, Copy, Debug)]
|
||||||
|
pub enum Direction {
|
||||||
|
Up,
|
||||||
|
Down,
|
||||||
|
Left,
|
||||||
|
Right,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl AddAssign<i8> for Direction {
|
||||||
|
fn add_assign(&mut self, rhs: i8) {
|
||||||
|
*self = *self + rhs;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl_op!(+ |a: Direction, b: i8| -> Direction {
|
||||||
|
match b {
|
||||||
|
-1 | 3 => match a {
|
||||||
|
Direction::Up => Direction::Left,
|
||||||
|
Direction::Right => Direction::Up,
|
||||||
|
Direction::Down => Direction::Right,
|
||||||
|
Direction::Left => Direction::Down,
|
||||||
|
},
|
||||||
|
1 | -3 => match a {
|
||||||
|
Direction::Up => Direction::Right,
|
||||||
|
Direction::Right => Direction::Down,
|
||||||
|
Direction::Down => Direction::Left,
|
||||||
|
Direction::Left => Direction::Up,
|
||||||
|
},
|
||||||
|
0 | 4 | -4 => a,
|
||||||
|
2 | -2 => match a {
|
||||||
|
Direction::Up => Direction::Down,
|
||||||
|
Direction::Right => Direction::Left,
|
||||||
|
Direction::Down => Direction::Up,
|
||||||
|
Direction::Left => Direction::Right,
|
||||||
|
},
|
||||||
|
n => unreachable!(format!("Illegal turn value: {}", n)),
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
impl Direction {
|
||||||
|
pub fn turn(&mut self, turn_value: i64) {
|
||||||
|
*self += turn_value as i8;
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,141 @@
|
||||||
|
use super::direction::*;
|
||||||
|
use impl_ops::*;
|
||||||
|
use itertools::iproduct;
|
||||||
|
use std::{convert::TryInto, hash::Hash, ops, ops::AddAssign};
|
||||||
|
|
||||||
|
pub trait Position
|
||||||
|
where Self: Sized + Hash + Eq
|
||||||
|
{
|
||||||
|
fn neighbors(&self) -> Vec<Self>;
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Hash, PartialEq, Eq, Debug, Clone, Copy)]
|
||||||
|
pub struct Position2D {
|
||||||
|
pub x: i64,
|
||||||
|
pub y: i64,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Hash, PartialEq, Eq, Debug, Clone, Copy)]
|
||||||
|
pub struct Position3D {
|
||||||
|
pub x: i64,
|
||||||
|
pub y: i64,
|
||||||
|
pub z: i64,
|
||||||
|
}
|
||||||
|
|
||||||
|
mod p2d {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
impl From<Direction> for Position2D {
|
||||||
|
fn from(d: Direction) -> Self {
|
||||||
|
match d {
|
||||||
|
Direction::Up => Position2D::from((0, 1)),
|
||||||
|
Direction::Right => Position2D::from((1, 0)),
|
||||||
|
Direction::Left => Position2D::from((-1, 0)),
|
||||||
|
Direction::Down => Position2D::from((0, -1)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Position for Position2D {
|
||||||
|
fn neighbors(&self) -> Vec<Position2D> {
|
||||||
|
vec![
|
||||||
|
*self + Direction::Up + Direction::Left,
|
||||||
|
*self + Direction::Up,
|
||||||
|
*self + Direction::Up + Direction::Right,
|
||||||
|
*self + Direction::Left,
|
||||||
|
*self + Direction::Right,
|
||||||
|
*self + Direction::Down + Direction::Left,
|
||||||
|
*self + Direction::Down,
|
||||||
|
*self + Direction::Down + Direction::Right,
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<I: Into<i64>> From<(I, I)> for Position2D {
|
||||||
|
fn from((x, y): (I, I)) -> Position2D {
|
||||||
|
Position2D { x: x.into(), y: y.into() }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl_op!(+|a: Position2D, b: Direction| -> Position2D { a + Position2D::from(b) });
|
||||||
|
|
||||||
|
impl_op!(-|a: Position2D, b: Direction| -> Position2D { a - Position2D::from(b) });
|
||||||
|
|
||||||
|
impl_op!(*|a: Position2D, b: i64| -> Position2D { Position2D { x: a.x * b, y: a.y * b } });
|
||||||
|
|
||||||
|
impl_op!(+|a: Position2D, b: Position2D| -> Position2D {
|
||||||
|
Position2D {
|
||||||
|
x: a.x + b.x,
|
||||||
|
y: a.y + b.y
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
impl_op!(-|a: Position2D, b: Position2D| -> Position2D {
|
||||||
|
Position2D {
|
||||||
|
x: a.x - b.x,
|
||||||
|
y: a.y - b.y,
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
impl AddAssign<Direction> for Position2D {
|
||||||
|
fn add_assign(&mut self, rhs: Direction) {
|
||||||
|
*self = *self + rhs;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl AddAssign for Position2D {
|
||||||
|
fn add_assign(&mut self, rhs: Position2D) {
|
||||||
|
*self = *self + rhs;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mod p3d {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
impl Position for Position3D {
|
||||||
|
fn neighbors(&self) -> Vec<Position3D> {
|
||||||
|
iproduct!((-1..=1), (-1..=1), (-1..=1))
|
||||||
|
.filter(|t| t != &(0, 0, 0))
|
||||||
|
.map(|(x, y, z)| *self + Position3D::from((x, y, z)))
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<I> From<(I, I, I)> for Position3D
|
||||||
|
where I: TryInto<i64>
|
||||||
|
{
|
||||||
|
fn from((x, y, z): (I, I, I)) -> Position3D {
|
||||||
|
Position3D {
|
||||||
|
x: unwrap_number_result(x),
|
||||||
|
y: unwrap_number_result(y),
|
||||||
|
z: unwrap_number_result(z),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl_op!(-|a: Position3D, b: Position3D| -> Position3D {
|
||||||
|
Position3D {
|
||||||
|
x: a.x - b.x,
|
||||||
|
y: a.y - b.y,
|
||||||
|
z: a.z - b.z,
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
impl_op!(+|a: Position3D, b: Position3D| -> Position3D {
|
||||||
|
Position3D {
|
||||||
|
x: a.x + b.x,
|
||||||
|
y: a.y + b.y,
|
||||||
|
z: a.z + b.z,
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// because calling .unwrap() on a TryInto result isn’t possible without trait bounds on the
|
||||||
|
// associated Error type.
|
||||||
|
fn unwrap_number_result<I: TryInto<i64>>(i: I) -> i64 {
|
||||||
|
match i.try_into() {
|
||||||
|
Ok(i) => return i,
|
||||||
|
_ => panic!("Bad coordinate"),
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user