Compare commits

...

12 Commits

Author SHA1 Message Date
c35270a6a2 day11: perf 2025-12-12 11:51:57 -08:00
845138dd2d day12: cache and bool 2025-12-12 03:42:47 -08:00
fd6b0c846b day12: cleanup and speedup 2025-12-12 03:10:32 -08:00
004591374c day12: part1. salty about this one, here's all my useless code 2025-12-12 00:15:38 -08:00
d0c14d004f grid: add rotated/mirrored 2025-12-12 00:15:15 -08:00
8cb33180ad day12: boilerplate 2025-12-11 21:00:06 -08:00
19426d1dc8 day11: cleanup 2025-12-11 00:36:59 -08:00
292638ea1d day11: part2 2025-12-11 00:23:27 -08:00
ef4de807d4 day11: part1 2025-12-10 21:26:25 -08:00
866544d416 day10: working but way too slow simd implementation 2025-12-10 10:15:01 -08:00
0a5e5c8798 day10: small performance boost 2025-12-09 22:45:38 -08:00
73b44b1377 day10: part1 2025-12-09 22:13:56 -08:00
11 changed files with 1271 additions and 6 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

398
Cargo.lock generated
View File

@@ -8,7 +8,7 @@ version = "0.8.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
dependencies = [
"cfg-if",
"cfg-if 1.0.4",
"once_cell",
"version_check",
"zerocopy",
@@ -72,20 +72,46 @@ dependencies = [
"rayon",
"regex",
"rstest",
"rustc_data_structures",
"wide",
]
[[package]]
name = "arrayvec"
version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
[[package]]
name = "autocfg"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
[[package]]
name = "bitflags"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
version = "2.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
[[package]]
name = "bumpalo"
version = "3.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
[[package]]
name = "bytemuck"
version = "1.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4"
[[package]]
name = "cached"
version = "0.56.0"
@@ -119,6 +145,12 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0"
[[package]]
name = "cfg-if"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
[[package]]
name = "cfg-if"
version = "1.0.4"
@@ -204,6 +236,15 @@ version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
[[package]]
name = "ena"
version = "0.14.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5"
dependencies = [
"log",
]
[[package]]
name = "encode_unicode"
version = "1.0.0"
@@ -216,6 +257,22 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
[[package]]
name = "errno"
version = "0.3.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
dependencies = [
"libc",
"windows-sys",
]
[[package]]
name = "fastrand"
version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
[[package]]
name = "fnv"
version = "1.0.7"
@@ -271,6 +328,18 @@ dependencies = [
"slab",
]
[[package]]
name = "getrandom"
version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
dependencies = [
"cfg-if 1.0.4",
"libc",
"r-efi",
"wasip2",
]
[[package]]
name = "glob"
version = "0.3.3"
@@ -281,6 +350,12 @@ checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
name = "grid"
version = "0.1.0"
[[package]]
name = "hashbrown"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
[[package]]
name = "hashbrown"
version = "0.15.5"
@@ -298,12 +373,29 @@ version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
[[package]]
name = "hermit-abi"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
[[package]]
name = "ident_case"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
[[package]]
name = "indexmap"
version = "1.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
dependencies = [
"autocfg",
"hashbrown 0.12.3",
"rustc-rayon 0.5.1",
]
[[package]]
name = "indexmap"
version = "2.12.1"
@@ -352,6 +444,16 @@ version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
[[package]]
name = "jobserver"
version = "0.1.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
dependencies = [
"getrandom",
"libc",
]
[[package]]
name = "js-sys"
version = "0.3.83"
@@ -362,18 +464,54 @@ dependencies = [
"wasm-bindgen",
]
[[package]]
name = "lazy_static"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "libc"
version = "0.2.178"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091"
[[package]]
name = "linux-raw-sys"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
[[package]]
name = "lock_api"
version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
dependencies = [
"scopeguard",
]
[[package]]
name = "log"
version = "0.4.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
[[package]]
name = "memchr"
version = "2.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
[[package]]
name = "memmap2"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "723e3ebdcdc5c023db1df315364573789f8857c11b631a2fdfad7c00f5c046b4"
dependencies = [
"libc",
]
[[package]]
name = "memoffset"
version = "0.9.1"
@@ -400,12 +538,45 @@ dependencies = [
"autocfg",
]
[[package]]
name = "num_cpus"
version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b"
dependencies = [
"hermit-abi",
"libc",
]
[[package]]
name = "once_cell"
version = "1.21.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
[[package]]
name = "parking_lot"
version = "0.12.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
dependencies = [
"lock_api",
"parking_lot_core",
]
[[package]]
name = "parking_lot_core"
version = "0.9.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
dependencies = [
"cfg-if 1.0.4",
"libc",
"redox_syscall",
"smallvec",
"windows-link",
]
[[package]]
name = "pin-project-lite"
version = "0.2.16"
@@ -451,6 +622,12 @@ dependencies = [
"proc-macro2",
]
[[package]]
name = "r-efi"
version = "5.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
[[package]]
name = "rayon"
version = "1.11.0"
@@ -471,6 +648,15 @@ dependencies = [
"crossbeam-utils",
]
[[package]]
name = "redox_syscall"
version = "0.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
dependencies = [
"bitflags 2.10.0",
]
[[package]]
name = "regex"
version = "1.12.2"
@@ -523,7 +709,7 @@ version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c845311f0ff7951c5506121a9ad75aec44d083c31583b2ea5a30bcb0b0abba0"
dependencies = [
"cfg-if",
"cfg-if 1.0.4",
"glob",
"proc-macro-crate",
"proc-macro2",
@@ -535,6 +721,79 @@ dependencies = [
"unicode-ident",
]
[[package]]
name = "rustc-hash"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]]
name = "rustc-rayon"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9974ab223660e61c1b4e7b43b827379df286736ca988308ce7e16f59f2d89246"
dependencies = [
"crossbeam-deque",
"either",
"rustc-rayon-core 0.3.2",
]
[[package]]
name = "rustc-rayon"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2cd9fb077db982d7ceb42a90471e5a69a990b58f71e06f0d8340bb2cf35eb751"
dependencies = [
"either",
"rustc-rayon-core 0.5.1",
]
[[package]]
name = "rustc-rayon-core"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "564bfd27be8db888d0fa76aa4335e7851aaed0c2c11ad1e93aeb9349f6b88500"
dependencies = [
"crossbeam-deque",
"crossbeam-utils",
"lazy_static",
"num_cpus",
]
[[package]]
name = "rustc-rayon-core"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f42932dcd3bcbe484b38a3ccf79b7906fac41c02d408b5b1bac26da3416efdb"
dependencies = [
"crossbeam-deque",
"crossbeam-utils",
]
[[package]]
name = "rustc_data_structures"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a38bae9c6afa27015bcaa2869e03bb111ecf0d0e0edc2da559a91d4057174c9a"
dependencies = [
"arrayvec",
"bitflags 1.3.2",
"cfg-if 0.1.10",
"ena",
"indexmap 1.9.3",
"jobserver",
"libc",
"memmap2",
"parking_lot",
"rustc-hash",
"rustc-rayon 0.3.2",
"rustc-rayon-core 0.3.2",
"stable_deref_trait",
"tempfile",
"tracing",
"winapi",
]
[[package]]
name = "rustc_version"
version = "0.4.1"
@@ -544,6 +803,19 @@ dependencies = [
"semver",
]
[[package]]
name = "rustix"
version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
dependencies = [
"bitflags 2.10.0",
"errno",
"libc",
"linux-raw-sys",
"windows-sys",
]
[[package]]
name = "rustversion"
version = "1.0.22"
@@ -556,6 +828,21 @@ version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
[[package]]
name = "safe_arch"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f7caad094bd561859bcd467734a720c3c1f5d1f338995351fefe2190c45efed"
dependencies = [
"bytemuck",
]
[[package]]
name = "scopeguard"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "semver"
version = "1.0.27"
@@ -610,6 +897,18 @@ version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
[[package]]
name = "smallvec"
version = "1.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
[[package]]
name = "stable_deref_trait"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
[[package]]
name = "strsim"
version = "0.11.1"
@@ -638,6 +937,19 @@ dependencies = [
"unicode-ident",
]
[[package]]
name = "tempfile"
version = "3.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
dependencies = [
"fastrand",
"getrandom",
"once_cell",
"rustix",
"windows-sys",
]
[[package]]
name = "thiserror"
version = "2.0.17"
@@ -673,7 +985,7 @@ version = "0.23.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d7cbc3b4b49633d57a0509303158ca50de80ae32c265093b24c414705807832"
dependencies = [
"indexmap",
"indexmap 2.12.1",
"toml_datetime",
"toml_parser",
"winnow",
@@ -688,6 +1000,37 @@ dependencies = [
"winnow",
]
[[package]]
name = "tracing"
version = "0.1.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647"
dependencies = [
"pin-project-lite",
"tracing-attributes",
"tracing-core",
]
[[package]]
name = "tracing-attributes"
version = "0.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.111",
]
[[package]]
name = "tracing-core"
version = "0.1.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c"
dependencies = [
"once_cell",
]
[[package]]
name = "unicode-ident"
version = "1.0.22"
@@ -712,13 +1055,22 @@ version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
[[package]]
name = "wasip2"
version = "1.0.1+wasi-0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
dependencies = [
"wit-bindgen",
]
[[package]]
name = "wasm-bindgen"
version = "0.2.106"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd"
dependencies = [
"cfg-if",
"cfg-if 1.0.4",
"once_cell",
"rustversion",
"wasm-bindgen-macro",
@@ -767,6 +1119,38 @@ dependencies = [
"wasm-bindgen",
]
[[package]]
name = "wide"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbace5de6cfc4866f684318ad85761c89380cfb191982ae96aa65c295bf5897e"
dependencies = [
"bytemuck",
"safe_arch",
]
[[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"
[[package]]
name = "windows-link"
version = "0.2.1"
@@ -791,6 +1175,12 @@ dependencies = [
"memchr",
]
[[package]]
name = "wit-bindgen"
version = "0.46.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
[[package]]
name = "zerocopy"
version = "0.8.31"

View File

@@ -14,6 +14,8 @@ misc = {path = "utils/misc"}
rayon = "1.11.0"
regex = "1.11.1"
rstest = "0.26.1"
rustc_data_structures = "0.1.2"
wide = "1.0.2"
[profile.release]
lto = true

View File

@@ -1,6 +1,6 @@
<!-- AOC TILES BEGIN -->
<h1 align="center">
2025 - 17 ⭐ - Rust
2025 - 21 ⭐ - Rust
</h1>
<a href="src/day1.rs">
<img src=".aoc_tiles/tiles/2025/01.png" width="161px">
@@ -29,4 +29,13 @@
<a href="src/day9.rs">
<img src=".aoc_tiles/tiles/2025/09.png" width="161px">
</a>
<a href="src/day10.rs">
<img src=".aoc_tiles/tiles/2025/10.png" width="161px">
</a>
<a href="src/day11.rs">
<img src=".aoc_tiles/tiles/2025/11.png" width="161px">
</a>
<a href="src/day12.rs">
<img src=".aoc_tiles/tiles/2025/12.png" width="161px">
</a>
<!-- AOC TILES END -->

331
src/day10.rs Normal file
View File

@@ -0,0 +1,331 @@
use std::{
collections::{BinaryHeap, VecDeque},
hash::Hash,
iter::{repeat, repeat_n},
};
use aoc_runner_derive::{aoc, aoc_generator};
use indicatif::{ProgressBar, ProgressStyle};
use itertools::Itertools;
use regex::Regex;
use wide::{CmpGt, i16x16};
#[derive(Clone, Debug, Default)]
struct MachineDefinition {
desired: Vec<bool>,
buttons: Vec<Vec<usize>>,
buttons2: Vec<i16x16>,
buttons_max: i16x16,
joltages: i16x16,
}
impl MachineDefinition {
fn create<'a>(&'a self) -> Machine<'a> {
Machine {
d: self,
lights: Vec::from_iter(repeat_n(false, self.desired.len())),
}
}
fn create2<'a>(&'a self) -> JoltMachine<'a> {
JoltMachine {
d: self,
joltages: i16x16::splat(0),
}
}
}
impl From<&str> for MachineDefinition {
fn from(value: &str) -> Self {
let parse_re = Regex::new(
r##"\[(?<desired>[.#]+)\] (?<buttons>(\([0-9,]+\) ?)+) \{(?<joltages>[0-9,]+)\}"##,
)
.unwrap();
let parts = parse_re.captures(value).unwrap();
let joltages: [i16; 16] = parts["joltages"]
.split(',')
.map(|n| n.parse().unwrap())
.chain(repeat(0))
.take(16)
.collect_array()
.unwrap();
let buttons = parts["buttons"]
.split_ascii_whitespace()
.map(|s| {
s[1..s.len() - 1]
.split(',')
.map(|n| n.parse().unwrap())
.collect()
})
.sorted_unstable_by_key(|s: &Vec<usize>| s.len())
.rev()
.collect_vec();
let mut buttons2 = Vec::new();
let mut buttons_max = [0i16; 16];
for (i, b) in buttons.iter().enumerate() {
let mut but = [0i16; 16];
for i in b {
but[*i] = 1;
}
buttons2.push(i16x16::new(but));
// find the joltage this button affects with the lowest value
// it is the max number of presses for this button
buttons_max[i] = b.iter().map(|idx| joltages[*idx]).min().unwrap();
}
MachineDefinition {
desired: parts["desired"].chars().map(|c| c == '#').collect(),
buttons: buttons,
buttons2: buttons2,
buttons_max: i16x16::new(buttons_max),
joltages: i16x16::new(joltages),
}
}
}
#[derive(Clone, Debug)]
struct Machine<'a> {
d: &'a MachineDefinition,
lights: Vec<bool>,
}
#[derive(Clone, Debug)]
struct JoltMachine<'a> {
d: &'a MachineDefinition,
joltages: i16x16,
}
impl<'a> Machine<'a> {
/// Get the state after pressing `button`, returns None if the state is as desired.
fn press(&self, button: usize) -> Option<Self> {
let mut new_state = self.lights.clone();
for light in &self.d.buttons[button] {
new_state[*light] = !new_state[*light];
}
if new_state == self.d.desired {
None
} else {
Some(Machine {
d: self.d,
lights: new_state,
})
}
}
/// Get the possible states from the current position
fn next_states(&self) -> Vec<(usize, Option<Self>)> {
self.d
.buttons
.iter()
.enumerate()
.map(|(i, _but)| (i, self.press(i)))
.collect()
}
}
impl<'a> JoltMachine<'a> {
fn press_jolts(&self, button: usize, presses: &i16x16) -> (i16x16, Option<Self>) {
// let mut new_joltage = self.joltages.clone();
// // for jolt in &self.d.buttons[button] {
// // new_joltage[*jolt] += 1;
// // }
let new_joltage = self.joltages + self.d.buttons2[button];
let mut new_presses = presses.clone();
new_presses.as_mut_array()[button] += 1;
if new_joltage == self.d.joltages {
(new_presses, None)
} else {
(
new_presses,
Some(Self {
d: self.d,
joltages: new_joltage,
}),
)
}
}
fn next_states_jolt(&self, presses: &i16x16) -> Vec<(i16x16, Option<Self>)> {
self.d
.buttons
.iter()
.enumerate()
.map(|(i, _but)| self.press_jolts(i, &presses))
// .inspect(|(p, o)| println!(" {p:?} {o:?}\n"))
// joltages monotonically increase, so cull any where a joltage is higher than needed
.filter(|(presses, candidate)| {
!presses.simd_gt(self.d.buttons_max).any()
&& candidate.as_ref().is_none_or(|c| {
!c.joltages.simd_gt(self.d.joltages).any()
// !c.joltages
// .iter()
// .zip(self.d.joltages.iter())
// .any(|(candidate, expected)| candidate > expected)
})
})
.collect()
}
}
#[derive(Debug, Clone)]
struct PressSet<'a> {
machine: Machine<'a>,
presses: usize,
}
#[derive(Debug, Clone)]
struct PressSet2<'a> {
machine: JoltMachine<'a>,
presses: i16x16,
}
// NOTE: All compares are reversed so our max heap becomes a min heap
impl<'a> Eq for PressSet<'a> {}
impl<'a> Eq for PressSet2<'a> {}
impl<'a> PartialEq for PressSet<'a> {
fn eq(&self, other: &Self) -> bool {
other.presses.eq(&self.presses)
}
}
impl<'a> PartialEq for PressSet2<'a> {
fn eq(&self, other: &Self) -> bool {
other.presses.eq(&self.presses)
}
}
impl<'a> PartialOrd for PressSet<'a> {
fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
Some(self.cmp(other))
}
}
impl<'a> PartialOrd for PressSet2<'a> {
fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
Some(self.cmp(other))
}
}
impl<'a> Ord for PressSet<'a> {
fn cmp(&self, other: &Self) -> std::cmp::Ordering {
other.presses.cmp(&self.presses)
}
}
impl<'a> Ord for PressSet2<'a> {
fn cmp(&self, other: &Self) -> std::cmp::Ordering {
other.presses.reduce_add().cmp(&self.presses.reduce_add())
}
}
fn find_best(md: &MachineDefinition) -> usize {
let m = md.create();
let mut to_check = BinaryHeap::new();
to_check.push(PressSet {
presses: 0,
machine: m,
});
while let Some(candidate) = to_check.pop() {
let cm = candidate.machine.clone();
for next in cm.next_states() {
let presses = candidate.presses + 1;
if let Some(new_m) = next.1 {
to_check.push(PressSet {
presses,
machine: new_m.clone(),
})
} else {
return presses;
}
}
}
panic!()
}
fn find_best_jolts(md: &MachineDefinition) -> usize {
let m = md.create2();
let mut to_check = VecDeque::new();
to_check.push_back(PressSet2 {
presses: i16x16::splat(0),
machine: m,
});
let mut pb = ProgressBar::no_length()
.with_style(
ProgressStyle::with_template(
"[{elapsed_precise}/{eta_precise}] {bar:40.cyan/blue} {pos:>7}/{len:7} {per_sec}",
)
.unwrap(),
)
.with_finish(indicatif::ProgressFinish::AndLeave);
while let Some(candidate) = to_check.pop_front() {
pb.inc(1);
pb.set_length(to_check.len() as u64);
let cm = candidate.machine.clone();
for (presses, next) in cm.next_states_jolt(&candidate.presses) {
if let Some(new_m) = next {
to_check.push_back(PressSet2 {
presses,
machine: new_m.clone(),
})
} else {
return presses.reduce_add() as usize;
}
}
}
panic!()
}
#[aoc_generator(day10)]
fn parse(input: &str) -> Vec<MachineDefinition> {
input.lines().map(|l| l.into()).collect()
}
#[aoc(day10, part1)]
fn part1(input: &[MachineDefinition]) -> u64 {
input
.iter()
.map(find_best)
// .inspect(|sol| println!(" [{sol:?}]"))
.map(|sol| sol as u64)
.sum()
}
#[aoc(day10, part2)]
fn part2(input: &[MachineDefinition]) -> u64 {
input
.iter()
.map(find_best_jolts)
.map(|sol| sol as u64)
.sum()
}
#[cfg(test)]
mod tests {
use rstest::rstest;
use super::*;
const EXAMPLE: &str = "[.##.] (3) (1,3) (2) (2,3) (0,2) (0,1) {3,5,4,7}
[...#.] (0,2,3,4) (2,3) (0,4) (0,1,2) (1,2,3,4) {7,5,12,7,2}
[.###.#] (0,1,2,3,4) (0,3,4) (0,1,2,4,5) (1,2) {10,11,11,5,10,5}";
#[rstest]
#[case(EXAMPLE, 7)]
fn part1_example(#[case] input: &str, #[case] expected: u64) {
assert_eq!(part1(&parse(input)), expected);
}
#[rstest]
#[case(EXAMPLE, 33)]
fn part2_example(#[case] input: &str, #[case] expected: u64) {
assert_eq!(part2(&parse(input)), expected);
}
}

203
src/day11.rs Normal file
View File

@@ -0,0 +1,203 @@
use aoc_runner_derive::{aoc, aoc_generator};
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
type Edges = FxHashMap<String, Vec<String>>;
#[aoc_generator(day11)]
fn parse(input: &str) -> Edges {
let mut edges: Edges = FxHashMap::default();
for l in input.lines() {
let (k, rest) = l.split_once(": ").unwrap();
for v in rest.split_ascii_whitespace() {
edges.entry(k.to_string()).or_default().push(v.to_string());
}
}
edges
}
fn find_path(cur: &str, goal: &str, edges: &Edges) -> u64 {
if cur == goal {
return 1;
}
if let Some(nexts) = edges.get(cur) {
nexts.iter().map(|n| find_path(n, goal, edges)).sum()
} else {
0
}
}
fn mark_paths<'a>(
cur: &'a str,
edges: &'a Edges,
mut reachable: FxHashSet<&'a str>,
) -> FxHashSet<&'a str> {
reachable.insert(cur);
if let Some(nexts) = edges.get(cur) {
for n in nexts {
if !reachable.contains(&n.as_str()) {
reachable = mark_paths(n, edges, reachable);
}
}
}
reachable
}
fn count_paths_impl<'a>(
cur: &'a str,
goal: &str,
edges: &'a Edges,
memo: &mut FxHashMap<&'a str, u64>,
) -> u64 {
if cur == goal {
return 1;
}
if let Some(v) = memo.get(cur) {
return *v;
}
if let Some(nexts) = edges.get(cur) {
let ret = nexts
.iter()
.map(|n| count_paths_impl(n, goal, edges, memo))
.sum();
memo.insert(cur, ret);
ret
} else {
memo.insert(cur, 0);
0
}
}
fn count_paths(cur: &str, goal: &str, edges: &Edges) -> u64 {
let mut cache = FxHashMap::default();
count_paths_impl(cur, goal, edges, &mut cache)
}
#[aoc(day11, part1, NaiveDfs)]
fn part1(fwd: &Edges) -> u64 {
find_path("you", "out", fwd)
}
#[aoc(day11, part1, MemoDfs)]
fn part1_memo(fwd: &Edges) -> u64 {
count_paths("you", "out", fwd)
}
#[aoc(day11, part2, MemoDfs)]
fn part2_memo(edges: &Edges) -> u64 {
// we assume all valid paths reach svr->fft->dac->out in that order. this holds on the example and the input.
// to handle both possible orderings, we need to sum paths fft->dac and dac->fft, and then partition the graph
// (just remove the node) at dac & fft before computing the sum of dac->out and fft->out.
//
// this is our performance implementation though and it's faster to not do that work. we do the posterity for the
// naive solution
count_paths("svr", "fft", edges)
* count_paths("fft", "dac", edges)
* count_paths("dac", "out", edges)
}
#[aoc(day11, part2, NaiveDfs)]
fn part2(edges: &Edges) -> u64 {
let mut rev = Edges::from_iter(edges.keys().map(|k| (k.to_owned(), vec![])));
for (from, tos) in edges {
for to in tos {
rev.entry(to.to_owned()).or_default().push(from.to_owned());
}
}
let mut reachable_dac = mark_paths("dac", edges, FxHashSet::default());
reachable_dac = mark_paths("dac", &rev, reachable_dac);
let mut reachable_fft = mark_paths("fft", edges, FxHashSet::default());
reachable_fft = mark_paths("fft", &rev, reachable_fft);
let reachable: FxHashSet<&str> = reachable_dac
.intersection(&reachable_fft)
.copied()
.collect();
let unreachable: FxHashSet<&str> = FxHashSet::from_iter(edges.keys().map(|k| k.as_str()))
.difference(&reachable)
.copied()
.collect();
let mut reachable_edges = edges.clone();
for k in &unreachable {
reachable_edges.remove(*k);
}
for (_k, v) in reachable_edges.iter_mut() {
for ur in &unreachable {
if let Some(idx) = v.iter().position(|s| s == ur) {
v.remove(idx);
}
}
}
// A real graph structure would probably notice that the graphs get split here
let mut reachable_edges_excl_fft = reachable_edges.clone();
reachable_edges_excl_fft.remove("fft");
let mut reachable_edges_excl_dac = reachable_edges.clone();
reachable_edges_excl_dac.remove("dac");
find_path("svr", "fft", &reachable_edges)
// only svr->fft->dac->out paths appear in my input and in the example, but include the dac->fft ordering
// as well, for posterity. It ~doubles runtime.
* (find_path("fft", "dac", &reachable_edges) + find_path("dac", "fft", &reachable_edges))
* (find_path("dac", "out", &reachable_edges_excl_fft) + find_path("fft", "out", &reachable_edges_excl_dac))
}
#[cfg(test)]
mod tests {
use rstest::rstest;
use super::*;
const EXAMPLE: &str = "aaa: you hhh
you: bbb ccc
bbb: ddd eee
ccc: ddd eee fff
ddd: ggg
eee: out
fff: out
ggg: out
hhh: ccc fff iii
iii: out";
const EXAMPLE2: &str = "svr: aaa bbb
aaa: fft
fft: ccc
bbb: tty
tty: ccc
ccc: ddd eee
ddd: hub
hub: fff
eee: dac
dac: fff
fff: ggg hhh
ggg: out
hhh: out";
#[rstest]
#[case(EXAMPLE, 5)]
fn part1_example(#[case] input: &str, #[case] expected: u64) {
assert_eq!(part1(&parse(input)), expected);
}
#[rstest]
#[case(EXAMPLE, 5)]
fn part1_memo_example(#[case] input: &str, #[case] expected: u64) {
assert_eq!(part1_memo(&parse(input)), expected);
}
#[rstest]
#[case(EXAMPLE2, 2)]
fn part2_example(#[case] input: &str, #[case] expected: u64) {
assert_eq!(part2(&parse(input)), expected);
}
#[rstest]
#[case(EXAMPLE2, 2)]
fn part2_memo_example(#[case] input: &str, #[case] expected: u64) {
assert_eq!(part2_memo(&parse(input)), expected);
}
}

249
src/day12.rs Normal file
View File

@@ -0,0 +1,249 @@
use aoc_runner_derive::{aoc, aoc_generator};
use grid::{Coord2d, Grid, MirrorAxis};
use itertools::Itertools;
use std::collections::HashSet;
use std::fmt::Display;
use std::iter::repeat_n;
type CellType = bool;
#[derive(Debug, Clone)]
struct PresentShape {
variants: Vec<Grid<CellType>>,
}
impl From<&str> for PresentShape {
fn from(value: &str) -> Self {
let (_idx, rest) = value.split_once(":\n").unwrap();
let shape_raw: Grid<u8> = rest.parse().unwrap();
let mut shape: Grid<CellType> = shape_raw.same_shape(false);
for pos in shape_raw.find_all(&b'#') {
shape.set(&pos, true);
}
Self {
variants: (0..4)
.map(|rot| shape.rotated(rot))
.chain([MirrorAxis::X, MirrorAxis::Y].map(|axis| shape.mirrored(axis)))
.unique()
.collect(),
}
}
}
impl Display for PresentShape {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.write_fmt(format_args!("{}", self.variants[0]))
}
}
impl PresentShape {
fn popcount(&self) -> u64 {
self.variants[0].count(&true) as u64
}
}
#[derive(Debug, Clone)]
struct Present {
shape: usize,
}
#[derive(Debug, Clone)]
struct ChristmasTree {
area: Grid<CellType>,
presents: Vec<Present>,
}
#[derive(Debug, Clone)]
struct PresentsProblem {
trees: Vec<ChristmasTree>,
shapes: Vec<PresentShape>,
}
#[aoc_generator(day12)]
fn parse(input: &str) -> PresentsProblem {
let mut parts = input.split("\n\n").collect_vec();
let trees_s = parts.pop().unwrap();
let shapes: Vec<PresentShape> = parts.into_iter().map(|p| p.into()).collect();
let mut trees = Vec::new();
for l in trees_s.lines() {
let (d, el) = l.split_once(": ").unwrap();
let (w, h) = d.split_once('x').unwrap();
let present_counts: Vec<usize> = el
.split_ascii_whitespace()
.map(|count| count.parse().unwrap())
.collect_vec();
let presents = present_counts
.iter()
.enumerate()
.flat_map(|(i, count)| repeat_n(Present { shape: i }, *count))
.collect();
trees.push(ChristmasTree {
area: Grid::with_shape(w.parse().unwrap(), h.parse().unwrap(), false),
presents,
});
}
PresentsProblem { trees, shapes }
}
// place b on a and test if any # overlap any non-.
// fn overlaps(a: &Grid<CellType>, b: &Grid<CellType>, p: &Coord2d) -> bool {
// b.find_all(&true)
// .any(|c| a.get(&(c + p)).is_some_and(|c| *c))
// }
impl PresentsProblem {
fn place_shape(
&self,
mut t: ChristmasTree,
idx: usize,
pos: Coord2d,
variant: usize,
) -> Option<ChristmasTree> {
let variant = &self.shapes[t.presents[idx].shape].variants[variant];
for xy in variant.find_all(&true) {
if let Some(was) = t.area.set(&(pos + &(xy)), true)
&& was
{
// overlapped
return None;
}
}
Some(t)
}
fn place_next(
&self,
t: ChristmasTree,
cur: usize,
cache: &mut HashSet<(usize, Grid<CellType>)>, // impossible shapes
) -> Option<ChristmasTree> {
if cur == t.presents.len() {
// done
return Some(t);
}
if cache.contains(&(cur, t.area.clone())) {
// doomed
return None;
}
let variants = &self.shapes[t.presents[cur].shape].variants;
for (i, _v) in variants.iter().enumerate() {
for y in 0..&t.area.height() - 2 {
for x in 0..&t.area.width() - 2 {
if let Some(new_t) = self.place_shape(
t.clone(),
cur,
Coord2d {
x: x as i64,
y: y as i64,
},
i,
) {
if let Some(solution) = self.place_next(new_t, cur + 1, cache) {
return Some(solution);
}
}
}
}
}
cache.insert((cur, t.area.clone()));
None
}
}
#[aoc(day12, part1)]
fn part1(input: &PresentsProblem) -> u64 {
let input = input.clone();
let mut count = 0;
for t in input.trees.iter() {
let area = (t.area.width() * t.area.height()) as u64;
let (occupied_area, present_count) = t
.presents
.iter()
.map(|p| (input.shapes[p.shape].popcount(), 1))
.reduce(|(o_a, pc_a), (o_b, pc_b)| (o_a + o_b, pc_a + pc_b))
.unwrap();
if occupied_area > area {
// definitely impossible
continue;
}
let available_3x3s = (t.area.width() / 3) * (t.area.height() / 3);
if available_3x3s >= present_count {
// definitely_possible
count += 1;
continue;
}
if input
.place_next(t.clone(), 0, &mut HashSet::new())
.is_some()
{
count += 1;
continue;
}
}
count
}
#[aoc(day12, part2)]
fn part2(_input: &PresentsProblem) -> u64 {
0
}
#[cfg(test)]
mod tests {
use super::*;
use rstest::rstest;
const EXAMPLE: &str = "0:
###
##.
##.
1:
###
##.
.##
2:
.##
###
##.
3:
##.
###
##.
4:
###
#..
###
5:
###
.#.
###
4x4: 0 0 0 0 2 0
12x5: 1 0 1 0 2 2
12x5: 1 0 1 0 3 2";
#[rstest]
#[case(EXAMPLE, 2)]
fn part1_example(#[case] input: &str, #[case] expected: u64) {
assert_eq!(part1(&parse(input)), expected);
}
#[rstest]
#[case(EXAMPLE, 0)]
fn part2_example(#[case] input: &str, #[case] expected: u64) {
assert_eq!(part2(&parse(input)), expected);
}
}

View File

@@ -1,4 +1,7 @@
mod day1;
mod day10;
mod day11;
mod day12;
mod day2;
mod day3;
mod day4;

View File

@@ -22,6 +22,11 @@ pub const ADJACENT_OFFSETS: [&(i64, i64); 8] = [
/// NESW
pub const CARDINAL_OFFSETS: [&(i64, i64); 4] = [&(0, -1), &(-1, 0), &(1, 0), &(0, 1)];
pub enum MirrorAxis {
X,
Y,
}
#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug)]
pub struct Coord2d {
pub x: i64,
@@ -281,7 +286,7 @@ impl<'a, T: Clone + Eq + PartialEq + Debug> Iterator for OffsetsIter<'a, T> {
}
}
#[derive(Clone, Eq, PartialEq, Debug)]
#[derive(Clone, Eq, PartialEq, Debug, Hash)]
pub struct Grid<T> {
pub data: Vec<T>,
width: i64,
@@ -486,6 +491,79 @@ impl<T: Clone + Eq + PartialEq + Debug> Grid<T> {
}
}
pub fn rotated(&self, mut rot: u8) -> Self {
rot %= 4;
match rot {
0 => self.clone(),
1 => {
let mut n = Grid::with_shape(self.height(), self.width(), self.data[0].clone()); // fill will be overwritten anyway
for y in 0..self.height() {
for x in 0..self.width() {
n.set(
&(self.height() - y - 1, x),
self.get(&(x as u64, y as u64)).unwrap().clone(),
);
}
}
n
}
2 => {
let mut n = Grid::with_shape(self.height(), self.width(), self.data[0].clone()); // fill will be overwritten anyway
for y in 0..self.height() {
for x in 0..self.width() {
n.set(
&(self.width() - x - 1, self.height() - y - 1),
self.get(&(x as u64, y as u64)).unwrap().clone(),
);
}
}
n
}
3 => {
let mut n = Grid::with_shape(self.height(), self.width(), self.data[0].clone()); // fill will be overwritten anyway
for y in 0..self.height() {
for x in 0..self.width() {
n.set(
&(self.height() - y - 1, self.width() - x - 1),
self.get(&(x as u64, y as u64)).unwrap().clone(),
);
}
}
n
}
_ => unreachable!("invalid rotation"),
}
}
pub fn mirrored(&self, axis: MirrorAxis) -> Self {
match axis {
MirrorAxis::X => {
let mut n = Grid::with_shape(self.height(), self.width(), self.data[0].clone()); // fill will be overwritten anyway
for y in 0..self.height() {
for x in 0..self.width() {
n.set(
&(self.width() - x - 1, y),
self.get(&(x as u64, y as u64)).unwrap().clone(),
);
}
}
n
}
MirrorAxis::Y => {
let mut n = Grid::with_shape(self.height(), self.width(), self.data[0].clone()); // fill will be overwritten anyway
for y in 0..self.height() {
for x in 0..self.width() {
n.set(
&(x, &self.height() - y - 1),
self.get(&(x as u64, y as u64)).unwrap().clone(),
);
}
}
n
}
}
}
// fn window_compare_impl<const REV: bool>(&self, needle: &[T]) -> Vec<(i64, i64)> {
// if (self.width as usize) < needle.len() {
// return Vec::new();