Skip to content

Commit 1529de7

Browse files
committed
Remove unnecessary mains
1 parent 4c17e90 commit 1529de7

26 files changed

+85
-242
lines changed

2024/src/main/java/dpr/aoc2024/All.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public static void main(String[] args) {
4141
Util.measureTime(() -> finalDays
4242
.forEach(d -> {
4343
System.out.printf("Day%02d%n", d.dayNum());
44-
d.execute();
44+
Util.measureTime(d::execute);
4545
}));
4646
}
4747
}

2024/src/main/java/dpr/aoc2024/Day01.java

+4-10
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,12 @@
1010
import java.util.List;
1111

1212
class Day01 implements Day {
13-
public static void main(String... args) {
14-
new Day01().execute();
15-
}
16-
1713
@Override
1814
public void execute() {
19-
Util.measureTime(() -> {
20-
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
21-
Locations result = getLocations(lines);
22-
System.out.println(part1(result));
23-
System.out.println(part2(result));
24-
});
15+
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
16+
Locations result = getLocations(lines);
17+
System.out.println(part1(result));
18+
System.out.println(part2(result));
2519
}
2620

2721
@Override

2024/src/main/java/dpr/aoc2024/Day02.java

+3-9
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,11 @@
88
import java.util.List;
99

1010
class Day02 implements Day {
11-
public static void main(String... args) {
12-
new Day02().execute();
13-
}
14-
1511
@Override
1612
public void execute() {
17-
Util.measureTime(() -> {
18-
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
19-
System.out.println(part1(lines));
20-
System.out.println(part2(lines));
21-
});
13+
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
14+
System.out.println(part1(lines));
15+
System.out.println(part2(lines));
2216
}
2317

2418
@Override

2024/src/main/java/dpr/aoc2024/Day03.java

+3-9
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,11 @@
88
import java.util.regex.Pattern;
99

1010
class Day03 implements Day {
11-
public static void main(String... args) {
12-
new Day03().execute();
13-
}
14-
1511
@Override
1612
public void execute() {
17-
Util.measureTime(() -> {
18-
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
19-
System.out.println(part1(lines));
20-
System.out.println(part2(lines));
21-
});
13+
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
14+
System.out.println(part1(lines));
15+
System.out.println(part2(lines));
2216
}
2317

2418
@Override

2024/src/main/java/dpr/aoc2024/Day04.java

+3-9
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,16 @@
1212
import java.util.Set;
1313

1414
class Day04 implements Day {
15-
public static void main(String... args) {
16-
new Day04().execute();
17-
}
18-
1915
private static final Character x = 'X';
2016
private static final Character m = 'M';
2117
private static final Character a = 'A';
2218
private static final Character s = 'S';
2319

2420
@Override
2521
public void execute() {
26-
Util.measureTime(() -> {
27-
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
28-
System.out.println(part1(lines));
29-
System.out.println(part2(lines));
30-
});
22+
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
23+
System.out.println(part1(lines));
24+
System.out.println(part2(lines));
3125
}
3226

3327
@Override

2024/src/main/java/dpr/aoc2024/Day05.java

+3-9
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,11 @@
1313
import java.util.stream.Stream;
1414

1515
class Day05 implements Day {
16-
public static void main(String... args) {
17-
new Day05().execute();
18-
}
19-
2016
@Override
2117
public void execute() {
22-
Util.measureTime(() -> {
23-
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
24-
System.out.println(part1(lines));
25-
System.out.println(part2(lines));
26-
});
18+
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
19+
System.out.println(part1(lines));
20+
System.out.println(part2(lines));
2721
}
2822

2923
@Override

2024/src/main/java/dpr/aoc2024/Day06.java

+4-10
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,12 @@
1414
import java.util.stream.Collectors;
1515

1616
class Day06 implements Day {
17-
public static void main(String... args) {
18-
new Day06().execute();
19-
}
20-
2117
@Override
2218
public void execute() {
23-
Util.measureTime(() -> {
24-
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
25-
Pair<Object, Object> solution1And2 = part1And2(lines);
26-
System.out.println(solution1And2.first());
27-
System.out.println(solution1And2.second());
28-
});
19+
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
20+
Pair<Object, Object> solution1And2 = part1And2(lines);
21+
System.out.println(solution1And2.first());
22+
System.out.println(solution1And2.second());
2923
}
3024

3125
@Override

2024/src/main/java/dpr/aoc2024/Day07.java

+3-9
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,11 @@
99
import java.util.Queue;
1010

1111
class Day07 implements Day {
12-
public static void main(String... args) {
13-
new Day07().execute();
14-
}
15-
1612
@Override
1713
public void execute() {
18-
Util.measureTime(() -> {
19-
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
20-
System.out.println(part1(lines));
21-
System.out.println(part2(lines));
22-
});
14+
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
15+
System.out.println(part1(lines));
16+
System.out.println(part2(lines));
2317
}
2418

2519
@Override

2024/src/main/java/dpr/aoc2024/Day08.java

+3-9
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,11 @@
1313
import java.util.Set;
1414

1515
class Day08 implements Day {
16-
public static void main(String... args) {
17-
new Day08().execute();
18-
}
19-
2016
@Override
2117
public void execute() {
22-
Util.measureTime(() -> {
23-
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
24-
System.out.println(part1(lines));
25-
System.out.println(part2(lines));
26-
});
18+
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
19+
System.out.println(part1(lines));
20+
System.out.println(part2(lines));
2721
}
2822

2923
@Override

2024/src/main/java/dpr/aoc2024/Day09.java

+3-9
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,11 @@
99
import java.util.List;
1010

1111
class Day09 implements Day {
12-
public static void main(String... args) {
13-
new Day09().execute();
14-
}
15-
1612
@Override
1713
public void execute() {
18-
Util.measureTime(() -> {
19-
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
20-
System.out.println(part1(lines));
21-
System.out.println(part2(lines));
22-
});
14+
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
15+
System.out.println(part1(lines));
16+
System.out.println(part2(lines));
2317
}
2418

2519
@Override

2024/src/main/java/dpr/aoc2024/Day10.java

+4-10
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,12 @@
1313
import java.util.Set;
1414

1515
class Day10 implements Day {
16-
public static void main(String... args) {
17-
new Day10().execute();
18-
}
19-
2016
@Override
2117
public void execute() {
22-
Util.measureTime(() -> {
23-
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
24-
Pair<Object, Object> solution1And2 = part1And2(lines);
25-
System.out.println(solution1And2.first());
26-
System.out.println(solution1And2.second());
27-
});
18+
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
19+
Pair<Object, Object> solution1And2 = part1And2(lines);
20+
System.out.println(solution1And2.first());
21+
System.out.println(solution1And2.second());
2822
}
2923

3024
@Override

2024/src/main/java/dpr/aoc2024/Day11.java

+3-9
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,11 @@
1010
import java.util.Map;
1111

1212
class Day11 implements Day {
13-
public static void main(String... args) {
14-
new Day11().execute();
15-
}
16-
1713
@Override
1814
public void execute() {
19-
Util.measureTime(() -> {
20-
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
21-
System.out.println(part1(lines));
22-
System.out.println(part2(lines));
23-
});
15+
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
16+
System.out.println(part1(lines));
17+
System.out.println(part2(lines));
2418
}
2519

2620
@Override

2024/src/main/java/dpr/aoc2024/Day12.java

+3-9
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,11 @@
1616
import java.util.stream.Collectors;
1717

1818
class Day12 implements Day {
19-
public static void main(String... args) {
20-
new Day12().execute();
21-
}
22-
2319
@Override
2420
public void execute() {
25-
Util.measureTime(() -> {
26-
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
27-
System.out.println(part1(lines));
28-
System.out.println(part2(lines));
29-
});
21+
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
22+
System.out.println(part1(lines));
23+
System.out.println(part2(lines));
3024
}
3125

3226
@Override

2024/src/main/java/dpr/aoc2024/Day13.java

+3-9
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,11 @@
66
import java.util.List;
77

88
class Day13 implements Day {
9-
public static void main(String... args) {
10-
new Day13().execute();
11-
}
12-
139
@Override
1410
public void execute() {
15-
Util.measureTime(() -> {
16-
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
17-
System.out.println(part1(lines));
18-
System.out.println(part2(lines));
19-
});
11+
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
12+
System.out.println(part1(lines));
13+
System.out.println(part2(lines));
2014
}
2115

2216
@Override

2024/src/main/java/dpr/aoc2024/Day14.java

+5-11
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,13 @@
1414
import java.util.stream.Collectors;
1515

1616
class Day14 implements Day {
17-
public static void main(String... args) {
18-
new Day14().execute();
19-
}
20-
2117
@Override
2218
public void execute() {
23-
Util.measureTime(() -> {
24-
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
25-
var X = 101;
26-
var Y = 103;
27-
System.out.println(part1(lines, X, Y));
28-
System.out.println(part2(lines, X, Y));
29-
});
19+
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
20+
var X = 101;
21+
var Y = 103;
22+
System.out.println(part1(lines, X, Y));
23+
System.out.println(part2(lines, X, Y));
3024
}
3125

3226
@Override

2024/src/main/java/dpr/aoc2024/Day15.java

+3-9
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,11 @@
1414
import java.util.stream.Stream;
1515

1616
class Day15 implements Day {
17-
public static void main(String... args) {
18-
new Day15().execute();
19-
}
20-
2117
@Override
2218
public void execute() {
23-
Util.measureTime(() -> {
24-
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
25-
System.out.println(part1(lines));
26-
System.out.println(part2(lines));
27-
});
19+
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
20+
System.out.println(part1(lines));
21+
System.out.println(part2(lines));
2822
}
2923

3024
@Override

2024/src/main/java/dpr/aoc2024/Day16.java

+4-10
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,12 @@
1414
import java.util.Set;
1515

1616
class Day16 implements Day {
17-
public static void main(String... args) {
18-
new Day16().execute();
19-
}
20-
2117
@Override
2218
public void execute() {
23-
Util.measureTime(() -> {
24-
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
25-
Pair<Object, Object> solution1And2 = part1And2(lines);
26-
System.out.println(solution1And2.first());
27-
System.out.println(solution1And2.second());
28-
});
19+
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
20+
Pair<Object, Object> solution1And2 = part1And2(lines);
21+
System.out.println(solution1And2.first());
22+
System.out.println(solution1And2.second());
2923
}
3024

3125
@Override

2024/src/main/java/dpr/aoc2024/Day17.java

+3-9
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,11 @@
1010
import java.util.stream.Collectors;
1111

1212
class Day17 implements Day {
13-
public static void main(String... args) {
14-
new Day17().execute();
15-
}
16-
1713
@Override
1814
public void execute() {
19-
Util.measureTime(() -> {
20-
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
21-
System.out.println(part1(lines));
22-
System.out.println(part2(lines));
23-
});
15+
var lines = Util.getNotEmptyLinesFromFile(dayNum(), "input.txt");
16+
System.out.println(part1(lines));
17+
System.out.println(part2(lines));
2418
}
2519

2620
@Override

0 commit comments

Comments
 (0)