wathiede/advent
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Shitty day 19 part 2 answer

Browse Source
This commit is contained in:
Bill Thiede 2020-12-19 15:16:10 -08:00
parent 4dc6fb41f3
commit 37fdc75db4
3 changed files with 301 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
2020/Cargo.lock generated
View File

@ -7,6 +7,7 @@ dependencies = [
"anyhow", "anyhow",
"aoc-runner", "aoc-runner",
"aoc-runner-derive", "aoc-runner-derive",
"pretty_assertions",
"regex", "regex",
] ]
@ -19,6 +20,15 @@ dependencies = [
"memchr", "memchr",
] ]
[[package]]
name = "ansi_term"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
dependencies = [
"winapi",
]
[[package]] [[package]]
name = "anyhow" name = "anyhow"
version = "1.0.34" version = "1.0.34"
@ -54,6 +64,22 @@ dependencies = [
"serde_json", "serde_json",
] ]
[[package]]
name = "ctor"
version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fbaabec2c953050352311293be5c6aba8e141ba19d6811862b232d6fd020484"
dependencies = [
"quote",
"syn",
]
[[package]]
name = "difference"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
[[package]] [[package]]
name = "itoa" name = "itoa"
version = "0.4.6" version = "0.4.6"
@ -72,6 +98,27 @@ version = "2.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
[[package]]
name = "output_vt100"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9"
dependencies = [
"winapi",
]
[[package]]
name = "pretty_assertions"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f81e1644e1b54f5a68959a29aa86cde704219254669da328ecfdf6a1f09d427"
dependencies = [
"ansi_term",
"ctor",
"difference",
"output_vt100",
]
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.24" version = "1.0.24"
@ -167,3 +214,25 @@ name = "unicode-xid"
version = "0.2.1" version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
[[package]]
name = "winapi"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
dependencies = [
"winapi-i686-pc-windows-gnu",
"winapi-x86_64-pc-windows-gnu",
]
[[package]]
name = "winapi-i686-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

2
2020/Cargo.toml
View File

@ -11,3 +11,5 @@ anyhow = "1.0.34"
aoc-runner = "0.3.0" aoc-runner = "0.3.0"
aoc-runner-derive = "0.3.0" aoc-runner-derive = "0.3.0"
regex = "1.4.2" regex = "1.4.2"
[dev-dependencies]
pretty_assertions = "0.6"

249
2020/src/day19.rs
View File

@ -48,6 +48,85 @@
//! Your goal is to determine the number of messages that completely match rule 0. In the above example, ababbb and abbbab match, but bababa, aaabbb, and aaaabbb do not, producing the answer 2. The whole message must match all of rule 0; there can't be extra unmatched characters in the message. (For example, aaaabbb might appear to match rule 0 above, but it has an extra unmatched b on the end.) //! Your goal is to determine the number of messages that completely match rule 0. In the above example, ababbb and abbbab match, but bababa, aaabbb, and aaaabbb do not, producing the answer 2. The whole message must match all of rule 0; there can't be extra unmatched characters in the message. (For example, aaaabbb might appear to match rule 0 above, but it has an extra unmatched b on the end.)
//! //!
//! How many messages completely match rule 0? //! How many messages completely match rule 0?
//!
//! --- Part Two ---
//! As you look over the list of messages, you realize your matching rules aren't quite right. To fix them, completely replace rules 8: 42 and 11: 42 31 with the following:
//!
//! 8: 42 | 42 8
//! 11: 42 31 | 42 11 31
//! This small change has a big impact: now, the rules do contain loops, and the list of messages they could hypothetically match is infinite. You'll need to determine how these changes affect which messages are valid.
//!
//! Fortunately, many of the rules are unaffected by this change; it might help to start by looking at which rules always match the same set of values and how those rules (especially rules 42 and 31) are used by the new versions of rules 8 and 11.
//!
//! (Remember, you only need to handle the rules you have; building a solution that could handle any hypothetical combination of rules would be significantly more difficult.)
//!
//! For example:
//!
//! 42: 9 14 | 10 1
//! 9: 14 27 | 1 26
//! 10: 23 14 | 28 1
//! 1: "a"
//! 11: 42 31
//! 5: 1 14 | 15 1
//! 19: 14 1 | 14 14
//! 12: 24 14 | 19 1
//! 16: 15 1 | 14 14
//! 31: 14 17 | 1 13
//! 6: 14 14 | 1 14
//! 2: 1 24 | 14 4
//! 0: 8 11
//! 13: 14 3 | 1 12
//! 15: 1 | 14
//! 17: 14 2 | 1 7
//! 23: 25 1 | 22 14
//! 28: 16 1
//! 4: 1 1
//! 20: 14 14 | 1 15
//! 3: 5 14 | 16 1
//! 27: 1 6 | 14 18
//! 14: "b"
//! 21: 14 1 | 1 14
//! 25: 1 1 | 1 14
//! 22: 14 14
//! 8: 42
//! 26: 14 22 | 1 20
//! 18: 15 15
//! 7: 14 5 | 1 21
//! 24: 14 1
//!
//! abbbbbabbbaaaababbaabbbbabababbbabbbbbbabaaaa
//! bbabbbbaabaabba
//! babbbbaabbbbbabbbbbbaabaaabaaa
//! aaabbbbbbaaaabaababaabababbabaaabbababababaaa
//! bbbbbbbaaaabbbbaaabbabaaa
//! bbbababbbbaaaaaaaabbababaaababaabab
//! ababaaaaaabaaab
//! ababaaaaabbbaba
//! baabbaaaabbaaaababbaababb
//! abbbbabbbbaaaababbbbbbaaaababb
//! aaaaabbaabaaaaababaa
//! aaaabbaaaabbaaa
//! aaaabbaabbaaaaaaabbbabbbaaabbaabaaa
//! babaaabbbaaabaababbaabababaaab
//! aabbbbbaabbbaaaaaabbbbbababaaaaabbaaabba
//! Without updating rules 8 and 11, these rules only match three messages: bbabbbbaabaabba, ababaaaaaabaaab, and ababaaaaabbbaba.
//!
//! However, after updating rules 8 and 11, a total of 12 messages match:
//!
//! bbabbbbaabaabba
//! babbbbaabbbbbabbbbbbaabaaabaaa
//! aaabbbbbbaaaabaababaabababbabaaabbababababaaa
//! bbbbbbbaaaabbbbaaabbabaaa
//! bbbababbbbaaaaaaaabbababaaababaabab
//! ababaaaaaabaaab
//! ababaaaaabbbaba
//! baabbaaaabbaaaababbaababb
//! abbbbabbbbaaaababbbbbbaaaababb
//! aaaaabbaabaaaaababaa
//! aaaabbaabbaaaaaaabbbabbbaaabbaabaaa
//! aabbbbbaabbbaaaaaabbbbbababaaaaabbaaabba
//! After updating rules 8 and 11, how many messages completely match rule 0?
use std::collections::HashMap; use std::collections::HashMap;
use std::fmt; use std::fmt;
@ -88,6 +167,7 @@ struct Resolver {
impl Resolver { impl Resolver {
fn resolve(&mut self, e: &Entry) -> String { fn resolve(&mut self, e: &Entry) -> String {
assert_ne!(e, &Entry::Rule(0));
if let Some(v) = self.resolved.get(e) { if let Some(v) = self.resolved.get(e) {
return v.to_string(); return v.to_string();
} }
@ -104,8 +184,10 @@ impl Resolver {
.clone() .clone()
.iter() .iter()
.map(|rule| { .map(|rule| {
let letters: Vec<_> = rule.iter().map(|e| self.resolve(e)).collect(); rule.iter()
letters.join("") .map(|e| self.resolve(e))
.collect::<Vec<_>>()
.join("")
}) })
.collect(); .collect();
let s = subrules.join("|"); let s = subrules.join("|");
@ -121,14 +203,30 @@ impl Resolver {
} }
fn expand_rulemap(rule_map: HashMap<usize, Vec<Vec<Entry>>>) -> Regex { fn expand_rulemap(rule_map: HashMap<usize, Vec<Vec<Entry>>>) -> Regex {
// Hack
let part2 = rule_map.len() > 8 && rule_map[&8].len() > 1;
let mut r = Resolver { let mut r = Resolver {
rule_map, rule_map,
resolved: HashMap::new(), resolved: HashMap::new(),
}; };
let rule_zero = r.rule_map[&0][0].clone(); let re = if part2 {
let re = rule_zero let hack = (1..10_usize)
.iter() .map(|i| {
.fold("".to_string(), |acc, e| format!("{}{}", acc, r.resolve(e))); format!(
"{}{}",
r.resolve(&Entry::Rule(42)).repeat(i),
r.resolve(&Entry::Rule(31)).repeat(i)
)
})
.collect::<Vec<_>>()
.join("|");
format!("({})+({})", r.resolve(&Entry::Rule(42)), hack)
} else {
let rule_zero = r.rule_map[&0][0].clone();
rule_zero
.iter()
.fold("".to_string(), |acc, e| format!("{}{}", acc, r.resolve(e)))
};
Regex::new(&format!(r"^{}$", re)).unwrap() Regex::new(&format!(r"^{}$", re)).unwrap()
} }
@ -146,13 +244,7 @@ fn make_rules(lines: Vec<String>) -> Regex {
sub.split(' ') sub.split(' ')
.map(|p| match p.parse() { .map(|p| match p.parse() {
Ok(n) => Entry::Rule(n), Ok(n) => Entry::Rule(n),
Err(_) => Entry::Char( Err(_) => Entry::Char(p[1..p.len() - 1].to_string()),
p.strip_prefix("\"")
.unwrap()
.strip_suffix("\"")
.unwrap()
.to_string(),
),
}) })
.collect() .collect()
}) })
@ -162,8 +254,8 @@ fn make_rules(lines: Vec<String>) -> Regex {
expand_rulemap(rules) expand_rulemap(rules)
} }
#[aoc_generator(day19)] #[aoc_generator(day19, part1)]
fn generator(input: &str) -> Input { fn generator_part1(input: &str) -> Input {
let mut it = input.split("\n\n"); let mut it = input.split("\n\n");
let rules = make_rules( let rules = make_rules(
it.next() it.next()
@ -191,10 +283,51 @@ fn solution1(input: &Input) -> usize {
.count() .count()
} }
#[aoc_generator(day19, part2)]
fn generator_part2(input: &str) -> Input {
let mut it = input.split("\n\n");
let rules = make_rules(
it.next()
.unwrap()
.split('\n')
.map(|s| s.trim())
.map(|s| {
if s.starts_with("8:") {
return "8: 42 | 42 8";
}
if s.starts_with("11:") {
return "11: 42 31 | 42 11 31";
}
s
})
.map(|s| s.to_string())
.collect(),
);
let messages = it
.next()
.unwrap()
.split('\n')
.map(|s| s.trim().to_string())
.collect();
Input { rules, messages }
}
#[aoc(day19, part2)]
fn solution2(input: &Input) -> usize {
input
.messages
.iter()
.filter(|msg| input.rules.is_match(msg))
.count()
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use pretty_assertions::assert_eq;
use super::*; use super::*;
const INPUT: &'static str = r#"0: 4 1 5 const INPUT1: &'static str = r#"0: 4 1 5
1: 2 3 | 3 2 1: 2 3 | 3 2
2: 4 4 | 5 5 2: 4 4 | 5 5
3: 4 5 | 5 4 3: 4 5 | 5 4
@ -209,13 +342,13 @@ mod tests {
#[test] #[test]
fn part1() { fn part1() {
assert_eq!(solution1(&generator(INPUT)), 2); assert_eq!(solution1(&generator_part1(INPUT1)), 2);
} }
#[test] #[test]
fn parse() { fn parse1() {
assert_eq!( assert_eq!(
generator(INPUT), generator_part1(INPUT1),
Input { Input {
rules: Regex::new("^a((aa|bb)(ab|ba)|(ab|ba)(aa|bb))b$").unwrap(), rules: Regex::new("^a((aa|bb)(ab|ba)|(ab|ba)(aa|bb))b$").unwrap(),
messages: vec!["ababbb", "bababa", "abbbab", "aaabbb", "aaaabbb",] messages: vec!["ababbb", "bababa", "abbbab", "aaabbb", "aaaabbb",]
@ -242,4 +375,82 @@ mod tests {
Regex::new("^(aa|bb)$").unwrap().as_str() Regex::new("^(aa|bb)$").unwrap().as_str()
); );
} }
const INPUT2: &'static str = r#"42: 9 14 | 10 1
9: 14 27 | 1 26
10: 23 14 | 28 1
1: "a"
11: 42 31
5: 1 14 | 15 1
19: 14 1 | 14 14
12: 24 14 | 19 1
16: 15 1 | 14 14
31: 14 17 | 1 13
6: 14 14 | 1 14
2: 1 24 | 14 4
0: 8 11
13: 14 3 | 1 12
15: 1 | 14
17: 14 2 | 1 7
23: 25 1 | 22 14
28: 16 1
4: 1 1
20: 14 14 | 1 15
3: 5 14 | 16 1
27: 1 6 | 14 18
14: "b"
21: 14 1 | 1 14
25: 1 1 | 1 14
22: 14 14
8: 42
26: 14 22 | 1 20
18: 15 15
7: 14 5 | 1 21
24: 14 1
abbbbbabbbaaaababbaabbbbabababbbabbbbbbabaaaa
bbabbbbaabaabba
babbbbaabbbbbabbbbbbaabaaabaaa
aaabbbbbbaaaabaababaabababbabaaabbababababaaa
bbbbbbbaaaabbbbaaabbabaaa
bbbababbbbaaaaaaaabbababaaababaabab
ababaaaaaabaaab
ababaaaaabbbaba
baabbaaaabbaaaababbaababb
abbbbabbbbaaaababbbbbbaaaababb
aaaaabbaabaaaaababaa
aaaabbaaaabbaaa
aaaabbaabbaaaaaaabbbabbbaaabbaabaaa
babaaabbbaaabaababbaabababaaab
aabbbbbaabbbaaaaaabbbbbababaaaaabbaaabba"#;
#[test]
fn part2_matches() {
let input = generator_part2(INPUT2);
assert_eq!(
input
.messages
.iter()
.filter(|msg| input.rules.is_match(msg))
.collect::<Vec<_>>(),
vec![
"bbabbbbaabaabba",
"babbbbaabbbbbabbbbbbaabaaabaaa",
"aaabbbbbbaaaabaababaabababbabaaabbababababaaa",
"bbbbbbbaaaabbbbaaabbabaaa",
"bbbababbbbaaaaaaaabbababaaababaabab",
"ababaaaaaabaaab",
"ababaaaaabbbaba",
"baabbaaaabbaaaababbaababb",
"abbbbabbbbaaaababbbbbbaaaababb",
"aaaaabbaabaaaaababaa",
"aaaabbaabbaaaaaaabbbabbbaaabbaabaaa",
"aabbbbbaabbbaaaaaabbbbbababaaaaabbaaabba",
]
);
}
#[test]
fn part2() {
assert_eq!(solution2(&generator_part2(INPUT2)), 12);
}
} }