Solved day 6 part 2

Author: Gentleman1983

README.md

@@ -44,6 +44,6 @@ To run all solutions, simply run `./gradlew run`. If you want to run the solutio
 | 23      | ❌       | ❌       |
 | 24      | ❌       | ❌       |
 | 25      | ❌       | ❌       |
-| **SUM** | **6 ⭐** | **5 ⭐** |
+| **SUM** | **6 ⭐** | **6 ⭐** |
 
-Total: 11 ⭐
+Total: 12 ⭐

build.gradle

@@ -4,7 +4,7 @@ plugins {
 
 // project meta data
 group 'de.havox_design.aoc2015'
-version '0.5.3'
+version '0.5.4'
 
 // Switch to gradle "all" distribution.
 wrapper {

day06/src/main/java/de/havox_design/aoc2015/day06/HouseDecoratingContest.java

@@ -12,6 +12,7 @@ public class HouseDecoratingContest {
 
     private final List<String> input;
     private final boolean[][] houseDecoration = new boolean[1000][1000];
+    private final int[][] brightness = new int[1000][1000];
 
     public HouseDecoratingContest(String fileName) {
         input = readData(fileName);
@@ -49,7 +50,8 @@ public int solvePart1() {
     }
 
     public int solvePart2() {
-        return 0;
+        solvePart1();
+        return countBrightness();
     }
 
     private int countNumberOfLitLights() {
@@ -66,6 +68,18 @@ private int countNumberOfLitLights() {
         return numberOfLightsLit;
     }
 
+    private int countBrightness() {
+        int currentBrightness = 0;
+
+        for(int x = 0; x < 1000; x++) {
+            for(int y = 0; y < 1000; y++) {
+                currentBrightness += brightness[x][y];
+            }
+        }
+
+        return currentBrightness;
+    }
+
     private int[] parseInstruction(String instruction, int offset) {
         int[] values = new int[4];
         String data = instruction.substring(offset);
@@ -81,24 +95,16 @@ private int[] parseInstruction(String instruction, int offset) {
         return values;
     }
 
-    private void turnOnLight(int x, int y) {
-        setLight(x, y, true);
-    }
-
     private void turnOnLight(int fromX, int toX, int fromY, int toY) {
-        setLight(fromX, toX, fromY, toY, true);
-    }
-
-    private void turnOffLight(int x, int y) {
-        setLight(x, y, false);
+        setLight(fromX, toX, fromY, toY, true, 1);
     }
 
     private void turnOffLight(int fromX, int toX, int fromY, int toY) {
-        setLight(fromX, toX, fromY, toY, false);
+        setLight(fromX, toX, fromY, toY, false, -1);
     }
 
     private void toggleLight(int x, int y) {
-        setLight(x, y, !houseDecoration[x][y]);
+        setLight(x, y, !houseDecoration[x][y], 2);
     }
 
     private void toggleLight(int fromX, int toX, int fromY, int toY) {
@@ -109,14 +115,19 @@ private void toggleLight(int fromX, int toX, int fromY, int toY) {
         }
     }
 
-    private void setLight(int x, int y, boolean value) {
+    private void setLight(int x, int y, boolean value, int brightnessChange) {
         houseDecoration[x][y] = value;
+        brightness[x][y] += brightnessChange;
+
+        if(brightness[x][y] < 0) {
+            brightness[x][y] = 0;
+        }
     }
 
-    private void setLight(int fromX, int toX, int fromY, int toY, boolean value) {
+    private void setLight(int fromX, int toX, int fromY, int toY, boolean value, int brightnessChange) {
         for(int x = fromX; x <= toX; x++) {
             for(int y = fromY; y <= toY; y++) {
-                setLight(x, y, value);
+                setLight(x, y, value, brightnessChange);
             }
         }
     }

day06/src/test/java/de/havox_design/aoc2015/day06/Day06Test.java

@@ -18,8 +18,8 @@ void testMainClass() {
 
     @ParameterizedTest
     @MethodSource("getDataForPart1")
-    void testPart1(String fileName, int expectedNumberOfNiceStrings) {
-        Assertions.assertEquals(expectedNumberOfNiceStrings, HouseDecoratingContest.solvePart1(fileName));
+    void testPart1(String fileName, int expectedNumberOfLights) {
+        Assertions.assertEquals(expectedNumberOfLights, HouseDecoratingContest.solvePart1(fileName));
     }
 
     private static Stream<Arguments> getDataForPart1() {
@@ -31,4 +31,21 @@ private static Stream<Arguments> getDataForPart1() {
                 Arguments.of("part1sample5.txt", 998996)
         );
     }
+
+    @ParameterizedTest
+    @MethodSource("getDataForPart2")
+    void testPart2(String fileName, int expectedBrightness) {
+        Assertions.assertEquals(expectedBrightness, HouseDecoratingContest.solvePart2(fileName));
+    }
+
+    private static Stream<Arguments> getDataForPart2() {
+        return Stream.of(
+                Arguments.of("part2sample1.txt", 1),
+                Arguments.of("part2sample2.txt", 0),
+                Arguments.of("part2sample3.txt", 2),
+                Arguments.of("part2sample4.txt", 1),
+                Arguments.of("part2sample5.txt", 2000000),
+                Arguments.of("part2sample6.txt", 2000003)
+        );
+    }
 }

day06/src/test/resources/part2sample1.txt

@@ -0,0 +1 @@
+turn on 0,0 through 0,0

day06/src/test/resources/part2sample2.txt

@@ -0,0 +1 @@
+turn off 0,0 through 0,0

day06/src/test/resources/part2sample3.txt

@@ -0,0 +1 @@
+toggle 0,0 through 0,0

day06/src/test/resources/part2sample4.txt

@@ -0,0 +1,2 @@
+toggle 0,0 through 0,0
+turn off 0,0 through 0,0

day06/src/test/resources/part2sample5.txt

@@ -0,0 +1 @@
+toggle 0,0 through 999,999

day06/src/test/resources/part2sample6.txt

@@ -0,0 +1,6 @@
+turn on 0,0 through 0,0
+turn off 0,0 through 0,0
+toggle 0,0 through 0,0
+toggle 0,0 through 0,0
+turn off 0,0 through 0,0
+toggle 0,0 through 999,999