From 8e076c11349333a02810272aa25e4896cb6bcc2e Mon Sep 17 00:00:00 2001 From: Bill Thiede Date: Sun, 6 Dec 2020 17:09:04 -0800 Subject: [PATCH] Enable `cargo run` and use this to run all solutions. --- 2020/README.md | 156 ++++++++++++++-------------------- 2020/scripts/update-readme.sh | 13 ++- 2020/src/lib.rs | 12 +-- 2020/src/main.rs | 5 ++ 4 files changed, 81 insertions(+), 105 deletions(-) create mode 100644 2020/src/main.rs diff --git a/2020/README.md b/2020/README.md index ac529b0..1bcdb78 100644 --- a/2020/README.md +++ b/2020/README.md @@ -1,100 +1,74 @@ # Results -## Day 1 ``` -AOC 2020 -Day 1 - Part 1 - binary : 1006875 - generator: 12.348µs, - runner: 551ns +Advent of code 2020 +Day 1 - Part 1 - binary: 1006875 + generator: 13.685µs, + runner: 383ns -Day 1 - Part 1 - linear : 1006875 - generator: 4.772µs, - runner: 7.732µs +Day 1 - Part 1 - linear: 1006875 + generator: 4.471µs, + runner: 6.725µs -Day 1 - Part 1 - set : 1006875 - generator: 17.746µs, - runner: 1.774µs +Day 1 - Part 1 - set: 1006875 + generator: 15.98µs, + runner: 723ns -Day 1 - Part 2 : 165026160 - generator: 4.323µs, - runner: 1.365709ms - -``` - -## Day 2 -``` -AOC 2020 -Day 2 - Part 1 : 640 - generator: 1.612816ms, - runner: 109.85µs - -Day 2 - Part 1 - handrolled : 640 - generator: 174.05µs, - runner: 121.356µs - -Day 2 - Part 2 : 472 - generator: 1.343394ms, - runner: 10.231µs - -``` - -## Day 3 -``` -AOC 2020 -Day 3 - Part 1 : 148 - generator: 36.372µs, - runner: 2.618µs - -Day 3 - Part 2 : 727923200 - generator: 35.711µs, - runner: 11.526µs - -``` - -## Day 4 -``` -AOC 2020 -Day 4 - Part 1 : 239 - generator: 413.353µs, - runner: 1.733µs - -Day 4 - Part 2 : 188 - generator: 344.204µs, - runner: 43.386µs - -``` - -## Day 5 -``` -AOC 2020 -Day 5 - Part 1 - glenng : 989 - generator: 217ns, - runner: 82.517µs - -Day 5 - Part 1 - wathiede : 989 - generator: 93.407µs, - runner: 451ns - -Day 5 - Part 2 - wathiede : 548 - generator: 80.326µs, - runner: 30.383µs - -``` - -## Day 6 -``` -AOC 2020 -Day 6 - Part 1 : 6930 - generator: 197ns, - runner: 544.074µs - -Day 6 - Part 2 : 3585 - generator: 134ns, - runner: 1.882783ms - -Day 6 - Part 2 - faster : 3585 - generator: 114ns, - runner: 998.495µs +Day 1 - Part 2: 165026160 + generator: 3.944µs, + runner: 1.18955ms + +Day 2 - Part 1: 640 + generator: 1.968685ms, + runner: 91.9µs + +Day 2 - Part 1 - handrolled: 640 + generator: 161.154µs, + runner: 91.825µs + +Day 2 - Part 2: 472 + generator: 1.430852ms, + runner: 9.525µs + +Day 3 - Part 1: 148 + generator: 32.889µs, + runner: 2.277µs + +Day 3 - Part 2: 727923200 + generator: 29.657µs, + runner: 9.883µs + +Day 4 - Part 1: 239 + generator: 421.829µs, + runner: 1.585µs + +Day 4 - Part 2: 188 + generator: 405.105µs, + runner: 37.591µs + +Day 5 - Part 1 - glenng: 989 + generator: 163ns, + runner: 68.995µs + +Day 5 - Part 1 - wathiede: 989 + generator: 75.661µs, + runner: 396ns + +Day 5 - Part 2 - wathiede: 548 + generator: 68.215µs, + runner: 24.548µs + +Day 6 - Part 1: 6930 + generator: 105ns, + runner: 543.519µs + +Day 6 - Part 2: 3585 + generator: 105ns, + runner: 1.697685ms + +Day 6 - Part 2 - faster: 3585 + generator: 103ns, + runner: 905.259µs ``` diff --git a/2020/scripts/update-readme.sh b/2020/scripts/update-readme.sh index d04663c..c6a9b1d 100755 --- a/2020/scripts/update-readme.sh +++ b/2020/scripts/update-readme.sh @@ -3,11 +3,8 @@ MAX_DAY=$(ls src/day* | tr -d 'a-z/. ' | sort -n | tail -1) ( echo "# Results" echo -for day in $(seq 1 ${MAX_DAY:?}); -do - echo "## Day ${day:?}" - echo "\`\`\`" - cargo aoc -d ${day:?} 2> /dev/null - echo "\`\`\`" - echo -done) > README.md +echo "\`\`\`" +cargo run --release +echo "\`\`\`" +echo +) > README.md diff --git a/2020/src/lib.rs b/2020/src/lib.rs index 843dd05..2028524 100644 --- a/2020/src/lib.rs +++ b/2020/src/lib.rs @@ -1,9 +1,9 @@ -mod day1; -mod day2; -mod day3; -mod day4; -mod day5; -mod day6; +pub mod day1; +pub mod day2; +pub mod day3; +pub mod day4; +pub mod day5; +pub mod day6; use aoc_runner_derive::aoc_lib; diff --git a/2020/src/main.rs b/2020/src/main.rs new file mode 100644 index 0000000..f340ceb --- /dev/null +++ b/2020/src/main.rs @@ -0,0 +1,5 @@ +use advent2020; + +use aoc_runner_derive::aoc_main; + +aoc_main! { lib = advent2020 }