thallada/advent-of-code-2020
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better names for things in day 3

Browse Source
This commit is contained in:
Tyler Hallada 2020-12-03 09:55:47 -05:00
parent aa5f86ecff
commit d57f26c617
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
day03/src/main.rs
View File

@ -33,12 +33,12 @@ impl fmt::Display for Cell {
#[derive(Debug, PartialEq)] #[derive(Debug, PartialEq)]
struct Slope { struct Slope {
pattern: Vec<Vec<Cell>>, topography: Vec<Vec<Cell>>,
} }
impl fmt::Display for Slope { impl fmt::Display for Slope {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
for row in &self.pattern { for row in &self.topography {
writeln!( writeln!(
f, f,
"{}", "{}",
@ -53,26 +53,26 @@ impl fmt::Display for Slope {
} }
#[derive(Debug, PartialEq)] #[derive(Debug, PartialEq)]
struct Position { struct Vector {
x: usize, x: usize,
y: usize, y: usize,
} }
impl Slope { impl Slope {
fn get_cell(&self, position: &Position) -> Cell { fn get_cell(&self, position: &Vector) -> Cell {
let row = &self.pattern[position.y]; let row = &self.topography[position.y];
row[position.x % row.len()] row[position.x % row.len()]
} }
fn trees_in_traversal(&self, traversal: &Position) -> usize { fn trees_in_traversal(&self, descent: &Vector) -> usize {
let mut position = Position { x: 0, y: 0 }; let mut position = Vector { x: 0, y: 0 };
let mut tree_count = match self.get_cell(&position) { let mut tree_count = match self.get_cell(&position) {
Cell::Tree => 1, Cell::Tree => 1,
_ => 0, _ => 0,
}; };
while position.y < self.pattern.len() - 1 { while position.y < self.topography.len() - 1 {
position.x += traversal.x; position.x += descent.x;
position.y += traversal.y; position.y += descent.y;
tree_count += match self.get_cell(&position) { tree_count += match self.get_cell(&position) {
Cell::Tree => 1, Cell::Tree => 1,
_ => 0, _ => 0,
@ -86,34 +86,34 @@ fn solve_part1(input_path: &str) -> Result<usize> {
let file = File::open(input_path)?; let file = File::open(input_path)?;
let reader = BufReader::new(file); let reader = BufReader::new(file);
let slope = Slope { let slope = Slope {
pattern: reader topography: reader
.lines() .lines()
.map(|line| line.unwrap().chars().map(Cell::from).collect::<Vec<Cell>>()) .map(|line| line.unwrap().chars().map(Cell::from).collect::<Vec<Cell>>())
.collect(), .collect(),
}; };
Ok(slope.trees_in_traversal(&Position { x: 3, y: 1 })) Ok(slope.trees_in_traversal(&Vector { x: 3, y: 1 }))
} }
fn solve_part2(input_path: &str) -> Result<usize> { fn solve_part2(input_path: &str) -> Result<usize> {
let file = File::open(input_path)?; let file = File::open(input_path)?;
let reader = BufReader::new(file); let reader = BufReader::new(file);
let slope = Slope { let slope = Slope {
pattern: reader topography: reader
.lines() .lines()
.map(|line| line.unwrap().chars().map(Cell::from).collect::<Vec<Cell>>()) .map(|line| line.unwrap().chars().map(Cell::from).collect::<Vec<Cell>>())
.collect(), .collect(),
}; };
let traversals: Vec<Position> = vec![ let descents = vec![
Position { x: 1, y: 1 }, Vector { x: 1, y: 1 },
Position { x: 3, y: 1 }, Vector { x: 3, y: 1 },
Position { x: 5, y: 1 }, Vector { x: 5, y: 1 },
Position { x: 7, y: 1 }, Vector { x: 7, y: 1 },
Position { x: 1, y: 2 }, Vector { x: 1, y: 2 },
]; ];
Ok(traversals Ok(descents
.iter() .iter()
.map(|traversal| slope.trees_in_traversal(&traversal)) .map(|descent| slope.trees_in_traversal(&descent))
.fold(1, |acc, count| acc * count)) .product())
} }
fn main() { fn main() {
@ -132,7 +132,7 @@ mod tests {
let file = File::open(TEST_INPUT).unwrap(); let file = File::open(TEST_INPUT).unwrap();
let reader = BufReader::new(file); let reader = BufReader::new(file);
let slope = Slope { let slope = Slope {
pattern: reader topography: reader
.lines() .lines()
.map(|line| line.unwrap().chars().map(Cell::from).collect::<Vec<Cell>>()) .map(|line| line.unwrap().chars().map(Cell::from).collect::<Vec<Cell>>())
.collect(), .collect(),