smellyfis/AOC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

forgot to do the slight optimizations

Browse Source
This commit is contained in:
Dylan "smellyfis" Thies
2022-12-18 07:22:15 -05:00
parent 2a200b2688
commit d9d5e378d0
1 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
day7/src/main.rs
View File

@@ -13,7 +13,7 @@ impl Sizer for Vec<usize> {
} }
} }
impl<T:Sizer> Sizer for Vec<T>{ impl<T: Sizer> Sizer for Vec<T> {
fn size(&self) -> usize { fn size(&self) -> usize {
self.iter().map(|x| x.size()).sum() self.iter().map(|x| x.size()).sum()
} }
@@ -76,7 +76,6 @@ impl MyDir {
fn new(name: impl Into<String>, parent_dir: Option<Rc<RefCell<MyDir>>>) -> Self { fn new(name: impl Into<String>, parent_dir: Option<Rc<RefCell<MyDir>>>) -> Self {
let name: String = name.into(); let name: String = name.into();
let parent_dir = parent_dir.map(|x| x.clone());
MyDir { MyDir {
name, name,
objects: Vec::new(), objects: Vec::new(),
@@ -105,21 +104,28 @@ impl Sizer for FileSystemTypes {
} }
} }
fn recurse_part1(collector: &mut Vec<usize>, cwd: &MyDir) -> usize{ fn recurse_part1(collector: &mut Vec<usize>, cwd: &MyDir) -> usize {
let mut cwd_size:usize = cwd.objects.iter().filter_map(|x| match x { let mut cwd_size: usize = cwd
FileSystemTypes::MyFile(y)=> Some(y.size()), .objects
_ => None, .iter()
}).sum(); .filter_map(|x| match x {
cwd_size += cwd.objects.iter().filter_map(|x| match x { FileSystemTypes::MyFile(y) => Some(y.size()),
FileSystemTypes::MyDir(y) => Some(y), _ => None,
_ => None, })
}).fold(0_usize, |folder, x| { .sum();
let sub_size = recurse_part1(collector, &x.borrow()); cwd_size += cwd
folder + sub_size .objects
}); .iter()
.filter_map(|x| match x {
FileSystemTypes::MyDir(y) => Some(y),
_ => None,
})
.fold(0_usize, |folder, x| {
let sub_size = recurse_part1(collector, &x.borrow());
folder + sub_size
});
collector.push(cwd_size); collector.push(cwd_size);
cwd_size cwd_size
} }
fn main() -> std::io::Result<()> { fn main() -> std::io::Result<()> {
@@ -158,23 +164,20 @@ fn main() -> std::io::Result<()> {
cursor.clone() cursor.clone()
} }
["$", "cd", "/"] => root.clone(), //set current directory back to root ["$", "cd", "/"] => root.clone(), //set current directory back to root
["$", "cd", ".."] => cursor.borrow().move_up().unwrap().clone(), ["$", "cd", ".."] => cursor.borrow().move_up().unwrap(),
["$", "cd", dir] => cursor.borrow().move_down(dir).unwrap().clone(), ["$", "cd", dir] => cursor.borrow().move_down(dir).unwrap(),
_ => panic!("unknown command {}", line), _ => panic!("unknown command {}", line),
} }
}); });
let mut part1 = Vec::new(); let mut part1 = Vec::new();
let max = recurse_part1(&mut part1, &root.borrow()); let max = recurse_part1(&mut part1, &root.borrow());
let part1_ans:usize = part1.iter().filter(|x| **x <= 100_000).sum(); let part1_ans: usize = part1.iter().filter(|x| **x <= 100_000).sum();
println!("{}", part1_ans); println!("Part 1: {}", part1_ans);
// TODO do a recursive function that get current directory size and puts it in vector then go
// into each sub directory
// find all less than 100_000 and sum
//part 2 //part 2
let free_space = 70_000_000_usize - max; let free_space = 70_000_000_usize - max;
let needed_clear_space = 30_000_000_usize - free_space; let needed_clear_space = 30_000_000_usize - free_space;
let part2 = part1.iter().filter(|x| **x >= needed_clear_space).min(); let part2 = part1.iter().filter(|x| **x >= needed_clear_space).min();
println!("{}", part2.unwrap()); println!("Part 2: {}", part2.unwrap());
Ok(()) Ok(())
} }