Merge branch 'main' of https://github.com/hunkyjimpjorps/AdventOfCode

3 files changed, 53 insertions, 18 deletions

diff --git a/aoc2023-other/day-01/day-01.rkt b/aoc2023-other/day-01/day-01.rkt
new file mode 100644
index 0000000..b720f79
--- /dev/null
+++ b/aoc2023-other/day-01/day-01.rkt
@@ -0,0 +1,38 @@
+#lang racket
+
+(require advent-of-code
+         threading)
+
+(define calibration-values (fetch-aoc-input (find-session) 2023 1))
+
+(define (to-number str)
+  (match (string->number str)
+    [#false (hash-ref word-to-digit str)]
+    [n n]))
+
+(define (parse-calibration-value v valid)
+  (for/fold ([acc '()] [value v] #:result (+ (to-number (first acc)) (* 10 (to-number (last acc)))))
+            ([_ (in-naturals)])
+    #:break (equal? value "")
+    (let ([possible-prefix (findf (curry string-prefix? value) valid)])
+      (if possible-prefix
+          (values (cons possible-prefix acc) (substring value 1))
+          (values acc (substring value 1))))))
+
+(define (total-calibration input valid)
+  (~> input
+      (string-trim)
+      (string-split "\n")
+      (map (λ~> (parse-calibration-value valid)) _)
+      (apply + _)))
+
+;; part 1
+
+(define valid-for-part-1 (~> (range 1 10) (map ~a _)))
+(total-calibration calibration-values valid-for-part-1)
+
+;; part 2
+(define word-to-digit
+  (hash "one" 1 "two" 2 "three" 3 "four" 4 "five" 5 "six" 6 "seven" 7 "eight" 8 "nine" 9))
+(define valid-for-part-2 (append valid-for-part-1 (hash-keys word-to-digit)))
+(total-calibration calibration-values valid-for-part-2)
diff --git a/aoc2023/adglent_cheatsheet.md b/aoc2023/adglent_cheatsheet.md
new file mode 100644
index 0000000..4061e1b
--- /dev/null
+++ b/aoc2023/adglent_cheatsheet.md
@@ -0,0 +1,3 @@
+Set up a solution: `gleam run -m adglent/day <n>`
+Check against examples: `gleam test -- --modules=day<n>/day<n>_test`
+Get final answer: `gleam run -m day<n>/solve <p>`
\ No newline at end of file
diff --git a/aoc2023/src/day1/solve.gleam b/aoc2023/src/day1/solve.gleam
index fbc160f..ed14bde 100644
--- a/aoc2023/src/day1/solve.gleam
+++ b/aoc2023/src/day1/solve.gleam
@@ -3,29 +3,24 @@ import gleam/io
 import gleam/list
 import gleam/string
 import gleam/regex.{type Match, Match}
-import gleam/result
 import gleam/int
 
-fn parse_digits(input: String) {
-  let assert Ok(re) = regex.from_string("[0-9]")
+pub fn part1(input: String) {
+  let assert Ok(re) = regex.from_string("[1-9]")
 
   input
   |> string.split("\n")
-  |> list.map(fn(s) {
-    let matches = regex.scan(s, with: re)
-
-    let assert Ok(Match(content: first, ..)) = list.first(matches)
-    let assert Ok(Match(content: last, ..)) = list.last(matches)
-
-    int.parse(first <> last)
-  })
-}
+  |> list.fold(
+    0,
+    fn(acc, s) {
+      let matches = regex.scan(s, with: re)
 
-pub fn part1(input: String) {
-  input
-  |> parse_digits
-  |> result.values
-  |> int.sum
+      let assert Ok(Match(content: first, ..)) = list.first(matches)
+      let assert Ok(Match(content: last, ..)) = list.last(matches)
+      let assert Ok(i) = int.parse(first <> last)
+      acc + i
+    },
+  )
   |> string.inspect
 }
 
@@ -39,7 +34,6 @@ const substitutions = [
   #("seven", "7n"),
   #("eight", "e8t"),
   #("nine", "n9e"),
-  #("zero", "0o"),
 ]
 
 pub fn part2(input: String) {