[Year 2022 Day 4 Part 2] ok

Author: Viinyard

solutions/src/main/java/dev/vinyard/adventofcode/soluce/year2022/day4/ASD.java

@@ -14,16 +14,24 @@ public Root(List<Pair> pairs) {
             this.pairs = pairs;
         }
 
-        public long result() {
+        public long part1() {
             return pairs.stream().filter(Pair::contains).count();
         }
 
+        public long part2() {
+            return pairs.stream().filter(Pair::overlaps).count();
+        }
+
     }
 
     public record Pair(Section left, Section right) {
         public boolean contains() {
             return left.contains(right) || right.contains(left);
         }
+
+        public boolean overlaps() {
+            return left.overlaps(right);
+        }
     }
 
     public static class Section {
@@ -36,6 +44,10 @@ public Section(long start, long end) {
         public boolean contains(Section section) {
             return this.range.containsRange(section.range);
         }
+
+        public boolean overlaps(Section section) {
+            return this.range.isOverlappedBy(section.range);
+        }
     }
 
 }

solutions/src/main/java/dev/vinyard/adventofcode/soluce/year2022/day4/Day4Part1Solution.java

@@ -61,6 +61,6 @@ public Long solve(String input) {
 
         ASD.Root root = parser.root().out;
 
-        return root.result();
+        return root.part1();
     }
 }

solutions/src/main/java/dev/vinyard/adventofcode/soluce/year2022/day4/Day4Part2Solution.java

@@ -0,0 +1,37 @@
+package dev.vinyard.adventofcode.soluce.year2022.day4;
+
+import dev.vinyard.aoc.plugins.solution.api.Solution;
+import dev.vinyard.aoc.plugins.solution.api.annotation.AdventOfCodeSolution;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+
+@AdventOfCodeSolution(year = 2022, day = 4, part = 2, description = "Camp Cleanup", link = "https://adventofcode.com/2022/day/4", tags = "unsolved")
+public class Day4Part2Solution implements Solution<Long> {
+
+    /**
+    * <h2>--- Part Two ---</h2>
+    * <p>It seems like there is still quite a bit of duplicate work planned. Instead, the Elves would like to know the number of pairs that <b>overlap at all</b>.</p>
+    * <p>In the above example, the first two pairs (2-4,6-8 and 2-3,4-5) don't overlap, while the remaining four pairs (5-7,7-9, 2-8,3-7, 6-6,4-6, and 2-6,4-8) do overlap:</p>
+    * <ul>
+    *  <li>5-7,7-9 overlaps in a single section, 7.</li>
+    *  <li>2-8,3-7 overlaps all of the sections 3 through 7.</li>
+    *  <li>6-6,4-6 overlaps in a single section, 6.</li>
+    *  <li>2-6,4-8 overlaps in sections 4, 5, and 6.</li>
+    * </ul>
+    * <p>So, in this example, the number of overlapping assignment pairs is <b>4</b>.</p>
+    * <p><b>In how many assignment pairs do the ranges overlap?</b></p>
+    */
+    @Override
+    public Long solve(String input) {
+        CharStream charStream = CharStreams.fromString(input);
+
+        SolutionLexer lexer = new SolutionLexer(charStream);
+        CommonTokenStream tokens = new CommonTokenStream(lexer);
+        SolutionParser parser = new SolutionParser(tokens);
+
+        ASD.Root root = parser.root().out;
+
+        return root.part2();
+    }
+}

solutions/src/test/java/dev/vinyard/adventofcode/soluce/year2022/day4/Day4Part1SolutionTest.java

@@ -16,7 +16,7 @@ public Solution<Long> getSolution() {
     @Override
     public Stream<Arguments> testSolution() {
         return Stream.of(
-            Arguments.of("soluce/year2022/day4/part1/test.txt", 2L, null, null),
+            Arguments.of("soluce/year2022/day4/test.txt", 2L, null, null),
             Arguments.of("soluce/year2022/day4/input.txt", 503L, null, null)
         );
     }

solutions/src/test/java/dev/vinyard/adventofcode/soluce/year2022/day4/Day4Part2SolutionTest.java

@@ -0,0 +1,23 @@
+package dev.vinyard.adventofcode.soluce.year2022.day4;
+
+import dev.vinyard.adventofcode.common.BaseTest;
+import dev.vinyard.aoc.plugins.solution.api.Solution;
+import org.junit.jupiter.params.provider.Arguments;
+
+import java.util.stream.Stream;
+
+public class Day4Part2SolutionTest extends BaseTest<Long> {
+
+    @Override
+    public Solution<Long> getSolution() {
+        return new Day4Part2Solution();
+    }
+
+    @Override
+    public Stream<Arguments> testSolution() {
+        return Stream.of(
+            Arguments.of("soluce/year2022/day4/test.txt", 4L, null, null),
+            Arguments.of("soluce/year2022/day4/input.txt", 827L, null, null)
+        );
+    }
+}