mx42/aoc2016
1
0
Fork 0
mirror of https://github.com/mx42/aoc2016.git synced 2026-01-14 13:49:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: fmt + clippy

Browse Source
This commit is contained in:
Xavier Morel
2024-11-28 22:33:52 +01:00
parent 826968bf50
commit 3559d1fb1e
1 changed files with 91 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
src/bin/11.rs
View File

@@ -1,7 +1,7 @@
advent_of_code::solution!(11); advent_of_code::solution!(11);
use periodic_table_on_an_enum::Element;
use itertools::Itertools; use itertools::Itertools;
use periodic_table_on_an_enum::Element;
use std::time::SystemTime; use std::time::SystemTime;
#[derive(Debug, Clone, PartialEq, PartialOrd, Ord, Eq)] #[derive(Debug, Clone, PartialEq, PartialOrd, Ord, Eq)]
@@ -21,7 +21,7 @@ impl Item {
#[derive(Clone, PartialEq)] #[derive(Clone, PartialEq)]
struct Floor { struct Floor {
items: Vec<Item> items: Vec<Item>,
} }
impl std::fmt::Debug for Floor { impl std::fmt::Debug for Floor {
@@ -51,11 +51,11 @@ fn is_hazardous(items: Vec<Item>) -> bool {
} }
for chip in chips { for chip in chips {
if !gens.contains(&chip) && gens.len() > 0 { if !gens.contains(&chip) && gens.is_empty() {
return true; return true;
} }
} }
return false; false
} }
impl State { impl State {
@@ -65,7 +65,7 @@ impl State {
} }
Self { Self {
current_floor: 0, current_floor: 0,
floors: floors.try_into().unwrap() floors: floors.try_into().unwrap(),
} }
} }
@@ -79,11 +79,10 @@ impl State {
floors[other.current_floor].items = prev_remaining; floors[other.current_floor].items = prev_remaining;
floors[current_floor].items = items; floors[current_floor].items = items;
let res = State { State {
current_floor: current_floor, current_floor,
floors: floors, floors,
}; }
res
} }
fn next_states(&self) -> Vec<State> { fn next_states(&self) -> Vec<State> {
@@ -120,10 +119,10 @@ impl State {
subsets subsets
.into_iter() .into_iter()
.filter_map( .filter_map(|set| {
|set| {
let remaining: Vec<Item> = items let remaining: Vec<Item> = items
.clone().into_iter() .clone()
.into_iter()
.filter(|f| !set.contains(f)) .filter(|f| !set.contains(f))
.collect(); .collect();
if is_hazardous(remaining.clone()) { if is_hazardous(remaining.clone()) {
@@ -135,14 +134,12 @@ impl State {
its.sort(); its.sort();
if !is_hazardous(its.clone()) { if !is_hazardous(its.clone()) {
// Build above State // Build above State
res.push( res.push(State::build_from(
State::build_from( self,
&self,
remaining.clone(), remaining.clone(),
self.current_floor + 1, self.current_floor + 1,
its its,
) ));
);
} }
} }
if let Some(mut its) = below_items.clone() { if let Some(mut its) = below_items.clone() {
@@ -150,37 +147,36 @@ impl State {
its.sort(); its.sort();
if !is_hazardous(its.clone()) { if !is_hazardous(its.clone()) {
// Build below State // Build below State
res.push( res.push(State::build_from(
State::build_from( self,
&self,
remaining.clone(), remaining.clone(),
self.current_floor - 1, self.current_floor - 1,
its its,
) ));
);
} }
} }
Some(res) Some(res)
} }
} })
)
.flatten() .flatten()
.collect::<Vec<State>>() .collect::<Vec<State>>()
} }
fn is_complete(&self) -> bool { fn is_complete(&self) -> bool {
self.floors[0].items.is_empty() && self.floors[0].items.is_empty()
self.floors[1].items.is_empty() && && self.floors[1].items.is_empty()
self.floors[2].items.is_empty() && self.floors[2].items.is_empty()
} }
// fn is_complete(self) -> bool;
// fn next_states(self) -> Vec<State>;
} }
impl std::fmt::Debug for State { impl std::fmt::Debug for State {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
let mut floors = self.floors.clone().into_iter().enumerate().collect::<Vec<_>>(); let mut floors = self
.floors
.clone()
.into_iter()
.enumerate()
.collect::<Vec<_>>();
floors.reverse(); floors.reverse();
for (n, floor) in floors { for (n, floor) in floors {
let cur = if n == self.current_floor { '>' } else { ' ' }; let cur = if n == self.current_floor { '>' } else { ' ' };
@@ -198,28 +194,20 @@ fn parse_line(input: &str) -> Floor {
if let Some(matter) = words.next() { if let Some(matter) = words.next() {
if let Some(it_type) = words.next() { if let Some(it_type) = words.next() {
// let it_type = it_type.strip_suffix(".").unwrap_or(it_type); // let it_type = it_type.strip_suffix(".").unwrap_or(it_type);
let matter = matter let matter = matter.strip_suffix("-compatible").unwrap_or(matter);
.strip_suffix("-compatible") let matter = matter.strip_suffix(",").unwrap_or(matter);
.unwrap_or(matter); items.push(match it_type {
let matter = matter g if g.starts_with("generator") => {
.strip_suffix(",") Item::Generator(Element::from_name(matter).expect("Missing element?!"))
.unwrap_or(matter); }
items.push( c if c.starts_with("microchip") => {
match it_type { Item::Chip(Element::from_name(matter).expect("Missing element?!"))
g if g.starts_with("generator") => }
Item::Generator(
Element::from_name(matter.into())
.expect("Missing element?!")),
c if c.starts_with("microchip") =>
Item::Chip(
Element::from_name(matter.into())
.expect("Missing element?!")),
_ => { _ => {
println!("{}", it_type); println!("{}", it_type);
panic!("invalid item type detected?!"); panic!("invalid item type detected?!");
},
} }
); });
} else { } else {
println!("input: {:?}", input); println!("input: {:?}", input);
panic!("invalid input format?"); panic!("invalid input format?");
@@ -229,13 +217,19 @@ fn parse_line(input: &str) -> Floor {
} }
} }
items.sort(); items.sort();
Floor { Floor { items }
items
}
} }
fn walk_through_states(iteration: usize, states: Vec<State>, saved_states: &mut [Vec<State>; 4], start_time: SystemTime) -> (usize, State) { fn walk_through_states(
println!(" ## after {:?}s", start_time.elapsed().unwrap().as_secs()); iteration: usize,
states: Vec<State>,
saved_states: &mut [Vec<State>; 4],
start_time: SystemTime,
) -> (usize, State) {
println!(
" ## after {:?}s",
start_time.elapsed().unwrap().as_secs()
);
println!("Iteration {:?}", iteration); println!("Iteration {:?}", iteration);
println!("States: {:?}", states.len()); println!("States: {:?}", states.len());
println!("Saved states:"); println!("Saved states:");
@@ -248,13 +242,11 @@ fn walk_through_states(iteration: usize, states: Vec<State>, saved_states: &mut
.into_iter() .into_iter()
.flat_map(|s| s.next_states()) .flat_map(|s| s.next_states())
.collect::<Vec<State>>(); .collect::<Vec<State>>();
let complete: Vec<State> = states.clone().into_iter().filter_map(|s| let complete: Vec<State> = states
if s.is_complete() { .clone()
Some(s) .into_iter()
} else { .filter_map(|s| if s.is_complete() { Some(s) } else { None })
None .collect();
}
).collect();
if !complete.is_empty() { if !complete.is_empty() {
(iteration, complete[0].clone()) (iteration, complete[0].clone())
} else { } else {
@@ -281,16 +273,15 @@ pub fn part_one(input: &str) -> Option<usize> {
.map(parse_line) .map(parse_line)
.collect(); .collect();
let state = State::init(floors); let state = State::init(floors);
let mut saved: [Vec<State>; 4] = [ let mut saved: [Vec<State>; 4] = [vec![state.clone()], vec![], vec![], vec![]];
vec![state.clone()], vec![], vec![], vec![] let (iterations, _st) =
]; walk_through_states(1, state.next_states(), &mut saved, SystemTime::now());
let (iterations, _st) = walk_through_states(1, state.next_states(), &mut saved, SystemTime::now());
// println!("{:#?}", _st); // println!("{:#?}", _st);
// println!("{:?}", iterations); // println!("{:?}", iterations);
Some(iterations + 1) Some(iterations + 1)
} }
pub fn part_two(input: &str) -> Option<usize> { pub fn part_two(_input: &str) -> Option<usize> {
// let mut floors: Vec<Floor> = input // let mut floors: Vec<Floor> = input
// .strip_suffix("\n") // .strip_suffix("\n")
// .unwrap_or(input) // .unwrap_or(input)