refactor: clean day 9 code

Author: Flashky

src/main/java/com/adventofcode/flashk/day09/DiskFragmenter.java

@@ -1,32 +1,25 @@
 package com.adventofcode.flashk.day09;
 
-import java.sql.Array;
 import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.List;
 
 public class DiskFragmenter {
 
-    private static final char EMPTY = '.';
-    private char[] diskMap;
-    private char[] disk;
-    private int lastBlockIndex = 0;
-    private Deque<Integer> diskDeque = new ArrayDeque<>();
+    private final Deque<Integer> diskDeque = new ArrayDeque<>();
 
     public DiskFragmenter(List<String> inputs) {
-        diskMap = inputs.get(0).toCharArray();
-        disk = new char[diskMap.length*9];
+        char[] diskMap = inputs.get(0).toCharArray();
 
         int fileId = 0;
-
+        int lastBlockIndex = 0;
         for(int i = 0; i < diskMap.length; i++) {
             int blockSize = Character.getNumericValue(diskMap[i]);
+
             for(int blockIndex = lastBlockIndex; blockIndex < lastBlockIndex + blockSize; blockIndex++) {
                 if(i % 2 == 0) {
-                    disk[blockIndex] = Character.forDigit(fileId, 10);
                     diskDeque.add(fileId);
                 } else {
-                    disk[blockIndex] = EMPTY;
                     diskDeque.add(-1);
                 }
             }
@@ -39,15 +32,14 @@ public DiskFragmenter(List<String> inputs) {
 
     }
 
-    public long solveA() {
-
+    public long solve() {
 
         long result = 0;
         int index = 0;
         while(!diskDeque.isEmpty()) {
             int current = diskDeque.pollFirst();
             if(current != -1) {
-                result += index * current;
+                result += (long) index * current;
                 index++;
             } else if(diskDeque.peekLast() != null){
                 diskDeque.addFirst(diskDeque.pollLast());
@@ -58,39 +50,6 @@ public long solveA() {
 
     }
 
-    public long solveB() {
-
-        return 0;
-    }
-    /*
-    private long checksum() {
-        long result = 0;
-        int i = 0;
-        while(disk[i] != EMPTY) {
-            result += ((long) Character.getNumericValue(disk[i])*(long)i);
-            i++;
-        }
-
-        return result;
-    }
-
-    private void moveToLeft(int blockIndex) {
-
-        char fileId = disk[blockIndex];
-        boolean emptyFound = false;
-        int i = 0;
-        while(!emptyFound && i < blockIndex) {
-
-            if(disk[i] == EMPTY) {
-                emptyFound = true;
-                disk[blockIndex] = EMPTY;
-                disk[i] = fileId;
-            }
-
-            i++;
-        }
-    }
-    */
 
 
 }

src/main/java/com/adventofcode/flashk/day09/File.java

@@ -5,8 +5,6 @@
 
 public class File {
 
-    private static int maxIdFile = 0;
-
     private final int id;
     @Getter
     private int startBlockIndex;

src/main/java/com/adventofcode/flashk/day09/Unallocated.java

@@ -1,7 +1,5 @@
 package com.adventofcode.flashk.day09;
 
-import lombok.Getter;
-
 public class Unallocated {
 
     private int startBlockIndex;

src/test/java/com/adventofcode/flashk/day09/Day09Test.java

@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
 import org.junit.jupiter.api.Order;
@@ -21,25 +20,10 @@
 
 @DisplayName(TestDisplayName.DAY_09)
 @TestMethodOrder(OrderAnnotation.class)
-public class Day09Test extends PuzzleTest {
+class Day09Test extends PuzzleTest {
 
 	private static final String INPUT_FOLDER = TestFolder.DAY_09;
 
-	@Test
-	@Order(1)
-	@Tag(TestTag.PART_1)
-	@Tag(TestTag.SAMPLE)
-	@DisplayName(TestDisplayName.PART_ONE_SINGLE_SAMPLE)
-	void testSolvePart1SingleSample() {
-
-		// Read input file
-		List<String> inputs = Input.readStringLines(INPUT_FOLDER, TestFilename.INPUT_FILE_SINGLE_SAMPLE);
-
-		DiskFragmenter diskFragmenter = new DiskFragmenter(inputs);
-
-		//assertEquals(0L, diskFragmenter.solveA());
-
-	}
 
 	@Test
 	@Order(1)
@@ -53,7 +37,7 @@ public void testSolvePart1Sample() {
 
 		DiskFragmenter diskFragmenter = new DiskFragmenter(inputs);
 
-		assertEquals(1928L, diskFragmenter.solveA());
+		assertEquals(1928L, diskFragmenter.solve());
 
 	}
 
@@ -69,7 +53,7 @@ public void testSolvePart1Input() {
 
 		DiskFragmenter diskFragmenter = new DiskFragmenter(inputs);
 
-		assertEquals(6310675819476L, diskFragmenter.solveA());
+		assertEquals(6310675819476L, diskFragmenter.solve());
 	}
 
 	@Test