{"header":{"message":"Extend day 11 solution to include part 2.","description":null,"timestamp":"2021-03-15T22:02:19Z","authors":[{"email":"jeremy.list@youdo.co.nz","name":"Jeremy List"}]},"hash":"CV3UDKDLBEI6DRKMGGUB6RPVTAURPVVTYUAUQXEHEFN5LG3A6FJQC","authors":[],"deps":{"hashes":[["CV3UDKDLBEI6DRKMGGUB6RPVTAURPVVTYUAUQXEHEFN5LG3A6FJQC","Extend day 11 solution to include part 2."],["AA",null],["7C23M57WZAP2YL5VXIGWQ3Z7MT2PTEUG7ADBZWJ7WHIJXOZ2BCNQC","Solution for day 11 part 1"]],"deps":["7C23M57WZAP2YL5VXIGWQ3Z7MT2PTEUG7ADBZWJ7WHIJXOZ2BCNQC"],"known":[]},"hunks":[{"Replacement":{"inode":{"change":2,"pos":11},"path":"2020/day11.rs","line":26,"ins":{"up_context":[{"change":2,"pos":541}],"down_context":[{"change":2,"pos":609}],"flag":"BLOCK","start":0,"end":1707,"inode":{"change":2,"pos":11}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":541},"to":{"change":2,"start":541,"end":609},"introduced_by":2}],"inode":{"change":2,"pos":11}},"ins_contents":[{"Add":"fn build_neighbourhoods_v1(grid: &Vec>) -> Vec>> {"},{"Add":" grid.into_iter().enumerate().map(|(y,row)|"},{"Add":" row.into_iter().enumerate().map(move |(x,lp)|"},{"Add":" match lp {"},{"Add":" LobbyPoint::Floor => vec![],"},{"Add":" _ => neighbours(x,y).flat_map(|(xn,yn)|"},{"Add":" usize::try_from(yn).ok().and_then(|yn|"},{"Add":" grid.get(yn).and_then(|row|"},{"Add":" usize::try_from(xn).ok().and_then(|xn|"},{"Add":" row.get(xn).and_then(|lp|"},{"Add":" match lp {"},{"Add":" LobbyPoint::Floor => None,"},{"Add":" _ => Some((xn,yn)),"},{"Add":" }"},{"Add":" )"},{"Add":" )"},{"Add":" )"},{"Add":" ).into_iter()"},{"Add":" ).collect(),"},{"Add":" }"},{"Add":" ).collect()"},{"Add":" ).collect()"},{"Add":"}"},{"Add":""},{"Add":"fn seek_line(x0: usize, y0: usize, xd: isize, yd: isize, grid: &Vec>) -> Option<(usize,usize)> {"},{"Add":" let x = x0.wrapping_add(xd as usize);"},{"Add":" let y = y0.wrapping_add(yd as usize);"},{"Add":" grid.get(y).and_then(|row| row.get(x)).and_then(|lp| match lp {"},{"Add":" LobbyPoint::Floor => seek_line(x, y, xd, yd, grid),"},{"Add":" _ => Some((x,y))"},{"Add":" })"},{"Add":"}"},{"Add":""},{"Add":"fn neighbours_v2<'a>(xc: usize, yc: usize, grid: &'a Vec>) -> impl Iterator + 'a {"},{"Add":" (-1 .. 2).flat_map(move |y| (-1 .. 2).map(move |x| (x,y)))"},{"Add":" .filter(|p| *p != (0,0))"},{"Add":" .flat_map(move |(x,y)| seek_line(xc,yc,x,y,grid).into_iter())"},{"Add":"}"},{"Add":""},{"Add":"fn build_neighbourhoods_v2(grid: &Vec>) -> Vec>> {"}],"del_contents":[{"Del":"fn time_step(grid: &Vec>) -> Vec> {\n"}]}},{"Replacement":{"inode":{"change":2,"pos":11},"path":"2020/day11.rs","line":67,"ins":{"up_context":[{"change":2,"pos":656}],"down_context":[{"change":2,"pos":716}],"flag":"BLOCK","start":1708,"end":2204,"inode":{"change":2,"pos":11}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":656},"to":{"change":2,"start":656,"end":716},"introduced_by":2}],"inode":{"change":2,"pos":11}},"ins_contents":[{"Add":" row.into_iter().enumerate().map(move |(x,lp)|"},{"Add":" match lp {"},{"Add":" LobbyPoint::Floor => vec![],"},{"Add":" _ => neighbours_v2(x,y,grid).collect(),"},{"Add":" }"},{"Add":" ).collect()"},{"Add":" ).collect()"},{"Add":"}"},{"Add":""},{"Add":"fn time_step(grid: &Vec>, neighbourhoods: &Vec>>, threshold: u16) -> Vec> {"},{"Add":" grid.into_iter().zip(neighbourhoods.into_iter()).map(|(gr,nr)|"},{"Add":" gr.into_iter().zip(nr.into_iter()).map(|(lp,n)| match lp {"}],"del_contents":[{"Del":" row.into_iter().enumerate().map(|(x,lp)| match lp {\n"}]}},{"Replacement":{"inode":{"change":2,"pos":11},"path":"2020/day11.rs","line":81,"ins":{"up_context":[{"change":2,"pos":787}],"down_context":[{"change":2,"pos":1369}],"flag":"BLOCK","start":2205,"end":2378,"inode":{"change":2,"pos":11}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":787},"to":{"change":2,"start":787,"end":1369},"introduced_by":2}],"inode":{"change":2,"pos":11}},"ins_contents":[{"Add":" let c: u16 = n.into_iter().map(|(x,y)| match grid[*y][*x] {"},{"Add":" LobbyPoint::Full => 1,"},{"Add":" _ => 0,"},{"Add":" }).sum();"}],"del_contents":[{"Del":" let nc: usize = neighbours(x,y).map(|(uxn,uyn)| usize::try_from(uyn).ok().\n and_then(|yn| usize::try_from(uxn).ok().and_then(move |xn|\n if yn >= grid.len() || xn >= grid[yn].len() {\n Some(0)\n } else {\n match grid[yn][xn] {\n LobbyPoint::Full => Some(1),\n _ => Some(0),\n }\n }\n )).unwrap_or(0)\n ).sum();\n"}]}},{"Replacement":{"inode":{"change":2,"pos":11},"path":"2020/day11.rs","line":86,"ins":{"up_context":[{"change":2,"pos":1396}],"down_context":[{"change":2,"pos":1597}],"flag":"BLOCK","start":2379,"end":2762,"inode":{"change":2,"pos":11}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1396},"to":{"change":2,"start":1396,"end":1597},"introduced_by":2}],"inode":{"change":2,"pos":11}},"ins_contents":[{"Add":" LobbyPoint::Full => if c >= threshold {"},{"Add":" LobbyPoint::Empty"},{"Add":" } else {"},{"Add":" LobbyPoint::Full"},{"Add":" },"},{"Add":" LobbyPoint::Empty => if c == 0 {"},{"Add":" LobbyPoint::Full"},{"Add":" } else {"},{"Add":" LobbyPoint::Empty"},{"Add":" },"}],"del_contents":[{"Del":" LobbyPoint::Full => if nc >= 4 { LobbyPoint::Empty } else { LobbyPoint::Full },\n LobbyPoint::Empty => if nc == 0 { LobbyPoint::Full } else { LobbyPoint::Empty },\n"}]}},{"Replacement":{"inode":{"change":2,"pos":11},"path":"2020/day11.rs","line":98,"ins":{"up_context":[{"change":2,"pos":1659}],"down_context":[{"change":2,"pos":1673}],"flag":"BLOCK","start":2763,"end":2778,"inode":{"change":2,"pos":11}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1659},"to":{"change":2,"start":1659,"end":1673},"introduced_by":2}],"inode":{"change":2,"pos":11}},"ins_contents":[{"Add":" },"}],"del_contents":[{"Del":" }\n"}]}},{"Edit":{"inode":{"change":2,"pos":11},"path":"2020/day11.rs","line":110,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":1991}],"down_context":[{"change":2,"pos":1991}],"flag":"BLOCK","start":2779,"end":3007,"inode":{"change":2,"pos":11}}},"contents":[{"Add":" let (neighbourhoods, threshold) = match args[2].as_ref() {"},{"Add":" \"1\" => (build_neighbourhoods_v1(&grid),4),"},{"Add":" \"2\" => (build_neighbourhoods_v2(&grid),5),"},{"Add":" _ => panic!(\"Version number (1 or 2) expected\")"},{"Add":" };"}]}},{"Replacement":{"inode":{"change":2,"pos":11},"path":"2020/day11.rs","line":116,"ins":{"up_context":[{"change":2,"pos":2002}],"down_context":[{"change":2,"pos":2040}],"flag":"BLOCK","start":3008,"end":3074,"inode":{"change":2,"pos":11}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2002},"to":{"change":2,"start":2002,"end":2040},"introduced_by":2}],"inode":{"change":2,"pos":11}},"ins_contents":[{"Add":" let grid2 = time_step(&grid, &neighbourhoods, threshold);"}],"del_contents":[{"Del":" let grid2 = time_step(&grid);\n"}]}}],"owner":"quickdudley","repo":"adventofcode","token":"JyNHoTIdOdt1ZOqoSjvd+f2IJ7fr0/M7oidMK8nBXkY=","login":null}

…

Dependencies

Change contents