kageru/advent-of-code
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Remove useless destructuring

This commit is contained in:
kageru 2021-12-17 14:06:31 +01:00
parent 10454bd621
commit 36ffc1cf00
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
2021/src/bin/day17.rs
View File

@ -13,6 +13,7 @@ enum ProbeStatus {
NoLongerReachable, NoLongerReachable,
} }
#[inline]
fn calc_status(((xvel, _), (x, y)): &Probe, (xtarget, ytarget): &TargetArea) -> ProbeStatus { fn calc_status(((xvel, _), (x, y)): &Probe, (xtarget, ytarget): &TargetArea) -> ProbeStatus {
if xtarget.contains(x) && ytarget.contains(y) { if xtarget.contains(x) && ytarget.contains(y) {
ProbeStatus::Hit ProbeStatus::Hit
@ -23,7 +24,8 @@ fn calc_status(((xvel, _), (x, y)): &Probe, (xtarget, ytarget): &TargetArea) ->
} }
} }
fn step(((xvel, yvel), (x, y)): Probe) -> Probe { #[inline]
fn step(((xvel, yvel), (x, y)): &Probe) -> Probe {
((xvel - xvel.signum(), yvel - 1), (x + xvel, y + yvel)) ((xvel - xvel.signum(), yvel - 1), (x + xvel, y + yvel))
} }
@ -31,23 +33,23 @@ fn parse_input() -> TargetArea {
(34..=67, -215..=-186) (34..=67, -215..=-186)
} }
fn part1(hits: &Vec<((isize, isize), isize)>) -> isize { fn part1(hits: &[((isize, isize), isize)]) -> isize {
*hits.iter().map(|(_, y)| y).max().unwrap() *hits.iter().map(|(_, y)| y).max().unwrap()
} }
fn find_hits(target: &TargetArea) -> Vec<((isize, isize), isize)> { fn find_hits(target: &TargetArea) -> Vec<((isize, isize), isize)> {
(1..=*target.0.end()) (1..=*target.0.end())
.flat_map(move |x| (*target.1.start()..250).map(move |y| (x, y))) .flat_map(move |x| (*target.1.start()..250).map(move |y| (x, y)))
.filter_map(|(xstart, ystart)| { .filter_map(|start| {
let mut probe = ((xstart, ystart), (0, 0)); let mut probe = (start, (0, 0));
let mut y_high = 0; let mut y_high = 0;
loop { loop {
probe = step(probe); probe = step(&probe);
if unlikely(probe.0 .1 == 0) { if unlikely(probe.0 .1 == 0) {
y_high = probe.1 .1; y_high = probe.1 .1;
} }
match calc_status(&probe, target) { match calc_status(&probe, target) {
ProbeStatus::Hit => return Some(((xstart, ystart), y_high)), ProbeStatus::Hit => return Some((start, y_high)),
ProbeStatus::Miss => continue, ProbeStatus::Miss => continue,
ProbeStatus::NoLongerReachable => return None, ProbeStatus::NoLongerReachable => return None,
} }