fix 2015 day 2 solution to be much cleaner

Author: jacobsandersen

src/main/java/dev/jacobandersen/codechallenges/challenge/adventofcode/AdventOfCodeBootstrap.java

@@ -24,10 +24,10 @@ public void run() {
  new Dummy().m();
  }
 
-// Year2015.getDays().forEach(Day::run);
+ Year2015.getDays().forEach(Day::run);
 // Year2020.getDays().forEach(Day::run);
 // Year2022.getDays().forEach(Day::run);
 // Year2023.getDays().forEach(Day::run);
- Year2024.getDays().forEach(Day::run);
+// Year2024.getDays().forEach(Day::run);
  }
 }

src/main/java/dev/jacobandersen/codechallenges/challenge/adventofcode/year2015/day2/Day2.java

@@ -1,44 +1,34 @@
 package dev.jacobandersen.codechallenges.challenge.adventofcode.year2015.day2;
 
 import dev.jacobandersen.codechallenges.challenge.adventofcode.Day;
-import dev.jacobandersen.codechallenges.util.CombinatoricsUtil;
+import dev.jacobandersen.codechallenges.util.RectangularCuboid;
 
 import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
 import java.util.List;
-import java.util.stream.Stream;
 
 public class Day2 extends Day {
  public Day2() {
  super(2015, 2, "I Was Told There Would Be No Math");
  }
 
- private List<List<Long>> getData() {
- return getInputLinesStreamNoBlanks().map(line -> Arrays.stream(line.split("x")).map(Long::parseLong).toList()).toList();
+ private List<RectangularCuboid> getData() {
+ return getInputLinesStreamNoBlanks()
+ .map(line -> Arrays.stream(line.split("x")).map(Integer::parseInt).toList())
+ .map(coords -> new RectangularCuboid(coords.get(0), coords.get(1), coords.get(2)))
+ .toList();
  }
 
- // Sorry, for what you are about to read. Yes it could be cleaner.
- // But, oh well. :D
-
  @Override
  public String partOne() {
  return String.valueOf(getData().stream()
- .map(gift -> (2 * gift.get(0) * gift.get(1)) + (2 * gift.get(1) * gift.get(2)) +
- (2 * gift.get(2) * gift.get(0)) + Stream.of(List.of(gift.get(0), gift.get(1)),
- List.of(gift.get(0), gift.get(2)), List.of(gift.get(1), gift.get(2)))
- .map(part -> part.get(0) * part.get(1))
- .min(Long::compareTo).orElseThrow())
- .reduce(0L, Long::sum));
+ .map(gift -> gift.surfaceArea() + gift.areaOfSmallestSide())
+ .reduce(0, Integer::sum));
  }
 
  @Override
  public String partTwo() {
  return String.valueOf(getData().stream()
- .map(gift -> (gift.get(0) * gift.get(1) * gift.get(2)) +
- Stream.of(List.of(gift.get(0), gift.get(1)), List.of(gift.get(0), gift.get(2)),
- List.of(gift.get(1), gift.get(2)))
- .map(part -> (2 * part.get(0)) + (2 * part.get(1))).min(Long::compareTo).orElseThrow())
- .reduce(0L, Long::sum));
+ .map(gift -> gift.perimeterOfSmallestSide() + gift.volume())
+ .reduce(0, Integer::sum));
  }
 }

src/main/java/dev/jacobandersen/codechallenges/util/RectangularCuboid.java

@@ -0,0 +1,42 @@
+package dev.jacobandersen.codechallenges.util;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Stream;
+
+public class RectangularCuboid implements Shape {
+ private final int length;
+ private final int width;
+ private final int height;
+
+ public RectangularCuboid(int length, int width, int height) {
+ this.length = length;
+ this.width = width;
+ this.height = height;
+ }
+
+ @Override
+ public int surfaceArea() {
+ return 2 * ((length * width) + (length * height) + (width * height));
+ }
+
+ @Override
+ public int volume() {
+ return length * width * height;
+ }
+
+ @Override
+ public int areaOfSmallestSide() {
+ return Stream.of(length * width, length * height, width * height)
+ .min(Integer::compareTo)
+ .orElseThrow();
+ }
+
+ @Override
+ public int perimeterOfSmallestSide() {
+ return Stream.of(length + width, length + height, width + height)
+ .map(halfPerimeter -> 2 * halfPerimeter)
+ .min(Integer::compareTo)
+ .orElseThrow();
+ }
+}

src/main/java/dev/jacobandersen/codechallenges/util/Shape.java

@@ -0,0 +1,8 @@
+package dev.jacobandersen.codechallenges.util;
+
+public interface Shape {
+ int surfaceArea();
+ int volume();
+ int areaOfSmallestSide();
+ int perimeterOfSmallestSide();
+}