Remove input macro from 2019 solutions

Author: code-shoily

lib/2019/day_01.ex

@@ -3,20 +3,23 @@ defmodule AdventOfCode.Y2019.Day01 do
   --- Day 1: The Tyranny of the Rocket Equation ---
   Problem Link: https://adventofcode.com/2019/day/1
   """
-  use AdventOfCode.Helpers.InputReader, year: 2019, day: 1
+  alias AdventOfCode.Helpers.InputReader
 
-  @spec run_1 :: non_neg_integer()
-  def run_1 do
-    input!()
-    |> parse()
+  def input, do: InputReader.read_from_file(2019, 1)
+
+  def run(input \\ input()) do
+    parsed_data = parse(input)
+    {run_1(parsed_data), run_2(parsed_data)}
+  end
+
+  def run_1(input) do
+    input
     |> Enum.map(&fuel_required/1)
     |> Enum.sum()
   end
 
-  @spec run_2 :: non_neg_integer()
-  def run_2 do
-    input!()
-    |> parse()
+  def run_2(input) do
+    input
     |> Enum.map(fn mass ->
       required_fuel = fuel_required(mass)
       refuel(required_fuel, required_fuel)

lib/2019/day_02.ex

@@ -3,16 +3,18 @@ defmodule AdventOfCode.Y2019.Day02 do
   --- Day 2: 1202 Program Alarm ---
   Problem Link: https://adventofcode.com/2019/day/2
   """
-  use AdventOfCode.Helpers.InputReader, year: 2019, day: 2
-
+  alias AdventOfCode.Helpers.InputReader
   alias AdventOfCode.Y2019.IntCode
 
+  def input, do: InputReader.read_from_file(2019, 2)
+
   @range 99..0
 
-  @spec run_1 :: integer()
-  def run_1 do
+  def run(input \\ input()), do: {run_1(input), run_2(input)}
+
+  def run_1(input) do
     {:ok, pid} =
-      input!()
+      input
       |> parse()
       |> fix1202()
       |> IntCode.start_link()
@@ -21,9 +23,8 @@ defmodule AdventOfCode.Y2019.Day02 do
     IntCode.get_output(pid)
   end
 
-  @spec run_2 :: integer | nil
-  def run_2 do
-    memory = input!() |> parse()
+  def run_2(input) do
+    memory = input |> parse()
 
     pairs = for i <- @range, j <- @range, do: {i, j}
 
@@ -53,6 +54,4 @@ defmodule AdventOfCode.Y2019.Day02 do
     |> List.replace_at(1, one)
     |> List.replace_at(2, two)
   end
-
-  def run, do: {run_1(), run_2()}
 end

lib/2019/day_03.ex

@@ -3,20 +3,25 @@ defmodule AdventOfCode.Y2019.Day03 do
   --- Day 3: Crossed Wires ---
   Problem Link: https://adventofcode.com/2019/day/3
   """
-  use AdventOfCode.Helpers.InputReader, year: 2019, day: 3
+  alias AdventOfCode.Helpers.InputReader
 
   @origin {0, 0}
 
-  def run_1 do
-    input!()
-    |> parse()
+  def input, do: InputReader.read_from_file(2019, 3)
+
+  def run(input \\ input()) do
+    input = parse(input)
+    {run_1(input), run_2(input)}
+  end
+
+  def run_1(input) do
+    input
     |> Enum.map(&move(&1, @origin, []))
     |> nearest_intersection()
   end
 
-  def run_2 do
-    input!()
-    |> parse()
+  def run_2(input) do
+    input
     |> Enum.map(fn wire ->
       wire
       |> move(@origin, [])

lib/2019/day_04.ex

@@ -3,14 +3,16 @@ defmodule AdventOfCode.Y2019.Day04 do
   --- Day 4: Secure Container ---
   Problem Link: https://adventofcode.com/2019/day/4
   """
-  @range 245_182..790_572
+  def input, do: 245_182..790_572
 
-  def run_1 do
-    Enum.count(for n <- @range, n |> adjacent() and n |> increasing(), do: n)
+  def run(input \\ input()), do: {run_1(input), run_2(input)}
+
+  def run_1(range) do
+    Enum.count(for n <- range, n |> adjacent() and n |> increasing(), do: n)
   end
 
-  def run_2 do
-    Enum.count(for n <- @range, n |> adjacent_2() and n |> increasing(), do: n)
+  def run_2(range) do
+    Enum.count(for n <- range, n |> adjacent_2() and n |> increasing(), do: n)
   end
 
   def adjacent(number) do

lib/2019/day_05.ex

@@ -3,14 +3,18 @@ defmodule AdventOfCode.Y2019.Day05 do
   --- Day 5: Sunny with a Chance of Asteroids ---
   Problem Link: https://adventofcode.com/2019/day/5
   """
-  use AdventOfCode.Helpers.InputReader, year: 2019, day: 5
-
+  alias AdventOfCode.Helpers.InputReader
   alias AdventOfCode.Y2019.IntCode
 
-  def parse(data), do: data |> String.split(",") |> Enum.map(&String.to_integer/1)
+  def input, do: InputReader.read_from_file(2019, 5)
+
+  def run(input \\ input()) do
+    input = parse(input)
+    {run_1(input), run_2(input)}
+  end
 
-  def run_1 do
-    {:ok, pid} = input!() |> parse() |> IntCode.start_link()
+  def run_1(input) do
+    {:ok, pid} = input |> IntCode.start_link()
     %{output: output} = IntCode.run(pid)
 
     output
@@ -21,7 +25,9 @@ defmodule AdventOfCode.Y2019.Day05 do
     end
   end
 
-  def run_2 do
-    {:not_implemented, 2}
+  def run_2(_) do
+    {:todo, 2}
   end
+
+  def parse(data), do: data |> String.split(",") |> Enum.map(&String.to_integer/1)
 end

lib/2019/day_06.ex

@@ -3,18 +3,23 @@ defmodule AdventOfCode.Y2019.Day06 do
   --- Day 6: Universal Orbit Map ---
   Problem Link: https://adventofcode.com/2019/day/6
   """
-  use AdventOfCode.Helpers.InputReader, year: 2019, day: 6
+  alias AdventOfCode.Helpers.InputReader
 
-  def run_1 do
-    input!()
-    |> parse()
+  def input, do: InputReader.read_from_file(2019, 6)
+
+  def run(input \\ input()) do
+    input = parse(input)
+    {run_1(input), run_2(input)}
+  end
+
+  def run_1(input) do
+    input
     |> to_graph(:digraph.new([:acyclic]))
     |> count_orbits()
   end
 
-  def run_2 do
-    input!()
-    |> parse()
+  def run_2(input) do
+    input
     |> to_graph(:digraph.new())
     |> count_orbital_transfers()
   end

lib/2019/day_08.ex

@@ -3,39 +3,45 @@ defmodule AdventOfCode.Y2019.Day08 do
   --- Day 8: Space Image Format ---
   Problem Link: https://adventofcode.com/2019/day/8
   """
-  use AdventOfCode.Helpers.InputReader, year: 2019, day: 8
+  alias AdventOfCode.Helpers.InputReader
 
   @width 25
   @height 6
   @printchar "▒"
 
-  def run_1 do
-    input!()
-    |> process()
+  def input, do: InputReader.read_from_file(2019, 8)
+
+  def run(input \\ input()) do
+    input = parse(input)
+
+    {run_1(input), run_2(input)}
+  end
+
+  def run_1(input) do
+    input
     |> Enum.map(fn layer -> Enum.flat_map(layer, & &1) end)
     |> Enum.min_by(&Enum.count(&1, fn x -> x == 0 end))
     |> then(fn x -> Enum.count(x, &(&1 == 2)) * Enum.count(x, &(&1 == 1)) end)
   end
 
-  def run_2 do
-    input!()
-    |> process()
+  def run_2(input) do
+    input
     |> Enum.map(fn layer -> Enum.flat_map(layer, & &1) end)
     |> Enum.reduce(&overlay(&2, &1))
     |> Enum.join()
     |> print_image()
   end
 
-  def process(data) do
+  def parse(data) do
     data
-    |> String.codepoints()
+    |> String.graphemes()
     |> Enum.map(&String.to_integer/1)
     |> chunkify()
   end
 
-  defp overlay(l1, l2) do
-    l1
-    |> Enum.zip(l2)
+  defp overlay(layer_1, layer_2) do
+    layer_1
+    |> Enum.zip(layer_2)
     |> Enum.map(fn
       {2, x} -> x
       {1, _} -> 1
@@ -49,9 +55,9 @@ defmodule AdventOfCode.Y2019.Day08 do
     |> String.replace("0", " ")
     |> String.codepoints()
     |> chunkify()
-    |> hd()
+    |> List.first()
     |> Enum.map_join("\n", &Enum.join/1)
-    |> IO.puts()
+    |> tap(&IO.puts/1)
   end
 
   defp chunkify(data) do

lib/2019/day_10.ex

@@ -3,21 +3,27 @@ defmodule AdventOfCode.Y2019.Day10 do
   --- Day 10: Monitoring Station ---
   Problem Link: https://adventofcode.com/2019/day/10
   """
-  use AdventOfCode.Helpers.InputReader, year: 2019, day: 10
+  alias AdventOfCode.Helpers.InputReader
 
   @asteroid "#"
 
-  def run_1 do
-    input!()
-    |> parse()
+  def input, do: InputReader.read_from_file(2019, 10)
+
+  def run(input \\ input()) do
+    input = parse(input)
+
+    {run_1(input), run_2(input)}
+  end
+
+  def run_1(input) do
+    input
     |> visible_asteroid_count()
     |> Enum.max_by(fn {_, number} -> number end)
     |> elem(1)
   end
 
-  def run_2 do
-    input!()
-    |> parse()
+  def run_2(input) do
+    input
     |> the_200th_asteroid()
     |> result()
   end
@@ -28,7 +34,7 @@ defmodule AdventOfCode.Y2019.Day10 do
     |> Enum.with_index()
     |> Enum.flat_map(fn {line, row} ->
       line
-      |> String.codepoints()
+      |> String.graphemes()
       |> Enum.with_index()
       |> Enum.map(fn {maybe_asteroid, col} ->
         {{col, row}, maybe_asteroid}

test/2019/day_01_test.exs

@@ -5,11 +5,7 @@ defmodule AdventOfCode.Y2019.Day01Test do
 
   alias AdventOfCode.Y2019.Day01, as: Solution
 
-  test "Year 2019, Day 1, Part 1" do
-    assert Solution.run_1() == 3_421_505
-  end
-
-  test "Year 2019, Day 1, Part 2" do
-    assert Solution.run_2() == 5_129_386
+  test "Year 2019, Day 1" do
+    assert Solution.run() == {3_421_505, 5_129_386}
   end
 end

test/2019/day_02_test.exs

@@ -5,11 +5,7 @@ defmodule AdventOfCode.Y2019.Day02Test do
 
   alias AdventOfCode.Y2019.Day02, as: Solution
 
-  test "Year 2019, Day 2, Part 1" do
-    assert Solution.run_1() == 3_562_624
-  end
-
-  test "Year 2019, Day 2, Part 2" do
-    assert Solution.run_2() == 8298
+  test "Year 2019, Day 2" do
+    assert Solution.run() == {3_562_624, 8298}
   end
 end

test/2019/day_03_test.exs

@@ -5,11 +5,7 @@ defmodule AdventOfCode.Y2019.Day03Test do
 
   alias AdventOfCode.Y2019.Day03, as: Solution
 
-  test "Year 2019, Day 3, Part 1" do
-    assert Solution.run_1() == 1195
-  end
-
-  test "Year 2019, Day 3, Part 2" do
-    assert Solution.run_2() == 91_518
+  test "Year 2019, Day 3" do
+    assert Solution.run() == {1195, 91_518}
   end
 end

test/2019/day_04_test.exs

@@ -5,11 +5,7 @@ defmodule AdventOfCode.Y2019.Day04Test do
 
   alias AdventOfCode.Y2019.Day04, as: Solution
 
-  test "Year 2019, Day 4, Part 1" do
-    assert Solution.run_1() == 1099
-  end
-
-  test "Year 2019, Day 4, Part 2" do
-    assert Solution.run_2() == 710
+  test "Year 2019, Day 4" do
+    assert Solution.run() == {1099, 710}
   end
 end

test/2019/day_05_test.exs

@@ -5,12 +5,7 @@ defmodule AdventOfCode.Y2019.Day05Test do
 
   alias AdventOfCode.Y2019.Day05, as: Solution
 
-  test "Year 2019, Day 5, Part 1" do
-    assert Solution.run_1() == 6_745_903
-  end
-
-  @tag :skip
-  test "Year 2019, Day 5, Part 2" do
-    assert Solution.run_2() == :not_implemented
+  test "Year 2019, Day 5" do
+    assert Solution.run() == {6_745_903, {:todo, 2}}
   end
 end

test/2019/day_06_test.exs

@@ -5,11 +5,7 @@ defmodule AdventOfCode.Y2019.Day06Test do
 
   alias AdventOfCode.Y2019.Day06, as: Solution
 
-  test "Year 2019, Day 6, Part 1" do
-    assert Solution.run_1() == 147_807
-  end
-
-  test "Year 2019, Day 6, Part 2" do
-    assert Solution.run_2() == 229
+  test "Year 2019, Day 6" do
+    assert Solution.run() == {147_807, 229}
   end
 end