Finally solve part 1

samjowen · Dec 23, 2023 · 58aedec · 58aedec
1 parent e8e8e7f
commit 58aedec
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 32 deletions.
diff --git a/lib/advent_of_code2023.ex b/lib/advent_of_code2023.ex
@@ -19,25 +19,27 @@ defmodule AdventOfCode2023 do
   def day1_solve_part_2(input_file_path) do
     # Variables that we need:
     replacement_map = %{
-      "zero" => "0",
-      "one" => "1",
-      "two" => "2",
-      "three" => "3",
-      "four" => "4",
-      "five" => "5",
-      "six" => "6",
-      "seven" => "7",
-      "eight" => "8",
-      "nine" => "9"
+      "zero" => "zero0zero",
+      "one" => "one1one",
+      "two" => "two2two",
+      "three" => "three3three",
+      "four" => "four4four",
+      "five" => "five5five",
+      "six" => "six6six",
+      "seven" => "seven7seven",
+      "eight" => "eight8eight",
+      "nine" => "nine9nine"
     }
 
     string_list = Day1.parse_file(input_file_path)
+    IO.inspect(string_list)
 
     replaced_number_list =
-      Enum.map(string_list, &Day1.replace_substrings(&1, replacement_map))
+      Enum.map(string_list, &Day1.convert_substrings_to_integer_strings(&1))
 
+    IO.inspect(replaced_number_list)
     number_list = Enum.map(replaced_number_list, &Day1.combine_first_and_last_number/1)
-
+    IO.inspect(number_list)
     Enum.sum(number_list)
   end
 end
diff --git a/lib/day1/day1.ex b/lib/day1/day1.ex
@@ -76,32 +76,32 @@ defmodule Day1 do
 
   def convert_word_to_integer_string(word) do
     case word do
-      "zero" -> "0"
-      "one" -> "1"
-      "two" -> "2"
-      "three" -> "3"
-      "four" -> "4"
-      "five" -> "5"
-      "six" -> "6"
-      "seven" -> "7"
-      "eight" -> "8"
-      "nine" -> "9"
+      "zero" -> "zero0zero"
+      "one" -> "one1one"
+      "two" -> "two2two"
+      "three" -> "three3three"
+      "four" -> "four4four"
+      "five" -> "five5five"
+      "six" -> "six6six"
+      "seven" -> "seven7seven"
+      "eight" -> "eight8eight"
+      "nine" -> "nine9nine"
       _ -> word
     end
   end
 
   def convert_substrings_to_integer_strings(string) do
     replacement_map = %{
-      "zero" => "0",
-      "one" => "1",
-      "two" => "2",
-      "three" => "3",
-      "four" => "4",
-      "five" => "5",
-      "six" => "6",
-      "seven" => "7",
-      "eight" => "8",
-      "nine" => "9"
+      "zero" => "zero0zero",
+      "one" => "one1one",
+      "two" => "two2two",
+      "three" => "three3three",
+      "four" => "four4four",
+      "five" => "five5five",
+      "six" => "six6six",
+      "seven" => "seven7seven",
+      "eight" => "eight8eight",
+      "nine" => "nine9nine"
     }
 
     sorted_map =

diff --git a/test/day1/day1_solves_test.exs b/test/day1/day1_solves_test.exs
@@ -13,4 +13,8 @@ defmodule Day1SolvesTest do
   test "solves the day 1 part II puzzle correctly" do
     assert AdventOfCode2023.day1_solve_part_2("./test/day1/mocks/part2-test-case.txt") == 281
   end
+
+  test "solves the day 1 part II puzzle correctly 2" do
+    assert AdventOfCode2023.day1_solve_part_2("./test/day1/mocks/part2-test-case-2.txt") == 79
+  end
 end
diff --git a/test/day1/mocks/part2-test-case-2.txt b/test/day1/mocks/part2-test-case-2.txt
@@ -0,0 +1 @@
+sevenine