Skip to content

Commit a44c395

Browse files
committed
refactor: clean some code
1 parent 8dd464a commit a44c395

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

src/main/java/com/adventofcode/flashk/day07/Equation.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.adventofcode.flashk.day07;
22

3-
import lombok.Getter;
43
import org.apache.commons.lang3.StringUtils;
54

65
import java.util.Arrays;
@@ -11,14 +10,14 @@
1110
public class Equation {
1211

1312
private final long result;
14-
private final Deque<Integer> operators;
13+
private final Deque<Integer> numbers;
1514
private boolean concatenate;
1615

1716
public Equation(String input) {
1817
String[] inputParts = input.split(": ");
1918
result = Long.parseLong(inputParts[0]);
20-
operators = Arrays.stream(inputParts[1].split(StringUtils.SPACE)).map(Integer::valueOf)
21-
.collect(Collectors.toCollection(ArrayDeque::new));
19+
numbers = Arrays.stream(inputParts[1].split(StringUtils.SPACE)).map(Integer::valueOf)
20+
.collect(Collectors.toCollection(ArrayDeque::new));
2221
}
2322

2423
public long solve(boolean concatenate) {
@@ -28,25 +27,25 @@ public long solve(boolean concatenate) {
2827

2928
private boolean hasSolution(long partialResult) {
3029

31-
if(operators.isEmpty()) {
30+
if(numbers.isEmpty()) {
3231
return partialResult == result;
3332
} else if(partialResult > result) {
3433
return false;
3534
}
3635

37-
Integer currentOperator = operators.poll();
38-
boolean hasSolution = hasSolution(partialResult + currentOperator);
36+
Integer number = numbers.poll();
37+
boolean hasSolution = hasSolution(partialResult + number);
3938

4039
if(!hasSolution) {
41-
hasSolution = hasSolution(partialResult * currentOperator);
40+
hasSolution = hasSolution(partialResult * number);
4241
}
4342

4443
if(!hasSolution && concatenate) {
45-
long concatenatedPartialResult = Long.parseLong(String.valueOf(partialResult) + currentOperator);
44+
long concatenatedPartialResult = Long.parseLong(String.valueOf(partialResult) + number);
4645
hasSolution = hasSolution(concatenatedPartialResult);
4746
}
4847

49-
operators.addFirst(currentOperator);
48+
numbers.addFirst(number);
5049

5150
return hasSolution;
5251
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class DiskDefragmenter {
1212

1313
public DiskDefragmenter(List<String> inputs){
1414

15-
char[] diskMap = inputs.get(0).toCharArray();
15+
char[] diskMap = inputs.getFirst().toCharArray();
1616
int fileId = 0;
1717
int blockIndex = 0;
1818

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class DiskFragmenter {
1010

1111
public DiskFragmenter(List<String> inputs) {
1212

13-
char[] diskMap = inputs.get(0).toCharArray();
13+
char[] diskMap = inputs.getFirst().toCharArray();
1414
int fileId = 0;
1515
int lastBlockIndex = 0;
1616

src/main/java/com/adventofcode/flashk/day11/PlutonianPebbles.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.util.HashMap;
77
import java.util.List;
88
import java.util.Map;
9+
910
import java.util.function.Function;
1011
import java.util.stream.Collectors;
1112

@@ -41,7 +42,7 @@ private void blink() {
4142
updateNumber(1L, rockCount, processedRocks);
4243
} else if(digits % 2 == 0) {
4344
String strNumber = String.valueOf(number);
44-
45+
4546
String strNumberLeft = strNumber.substring(0, strNumber.length() / 2);
4647
updateNumber(Long.parseLong(strNumberLeft), rockCount, processedRocks);
4748

0 commit comments

Comments
 (0)