From 3427e536981406fd12e48a401b93fe262f6d9051 Mon Sep 17 00:00:00 2001 From: Sugui Date: Thu, 7 Dec 2023 12:09:13 +0100 Subject: [PATCH] moved each day to their specific folder --- src/main/java/sugui/{ => day01}/Day01.java | 0 src/main/java/sugui/{ => day02}/Day02.java | 0 src/main/java/sugui/{ => day03}/Day03.java | 0 src/main/java/sugui/{ => day04}/Day04.java | 0 src/main/java/sugui/{ => day05}/Day05.java | 0 src/main/java/sugui/{ => day06}/Day06.java | 0 src/main/java/sugui/{aux => day07}/Card.java | 2 +- src/main/java/sugui/{aux => day07}/CardComparator.java | 2 +- .../java/sugui/{aux => day07}/CardWithJokerComparator.java | 2 +- src/main/java/sugui/{ => day07}/Day07.java | 7 +------ src/main/java/sugui/{aux => day07}/Hand.java | 2 +- src/main/java/sugui/{aux => day07}/HandComparator.java | 4 ++-- .../java/sugui/{aux => day07}/HandWithJokerComparator.java | 4 ++-- 13 files changed, 9 insertions(+), 14 deletions(-) rename src/main/java/sugui/{ => day01}/Day01.java (100%) rename src/main/java/sugui/{ => day02}/Day02.java (100%) rename src/main/java/sugui/{ => day03}/Day03.java (100%) rename src/main/java/sugui/{ => day04}/Day04.java (100%) rename src/main/java/sugui/{ => day05}/Day05.java (100%) rename src/main/java/sugui/{ => day06}/Day06.java (100%) rename src/main/java/sugui/{aux => day07}/Card.java (64%) rename src/main/java/sugui/{aux => day07}/CardComparator.java (93%) rename src/main/java/sugui/{aux => day07}/CardWithJokerComparator.java (93%) rename src/main/java/sugui/{ => day07}/Day07.java (93%) rename src/main/java/sugui/{aux => day07}/Hand.java (92%) rename src/main/java/sugui/{aux => day07}/HandComparator.java (97%) rename src/main/java/sugui/{aux => day07}/HandWithJokerComparator.java (97%) diff --git a/src/main/java/sugui/Day01.java b/src/main/java/sugui/day01/Day01.java similarity index 100% rename from src/main/java/sugui/Day01.java rename to src/main/java/sugui/day01/Day01.java diff --git a/src/main/java/sugui/Day02.java b/src/main/java/sugui/day02/Day02.java similarity index 100% rename from src/main/java/sugui/Day02.java rename to src/main/java/sugui/day02/Day02.java diff --git a/src/main/java/sugui/Day03.java b/src/main/java/sugui/day03/Day03.java similarity index 100% rename from src/main/java/sugui/Day03.java rename to src/main/java/sugui/day03/Day03.java diff --git a/src/main/java/sugui/Day04.java b/src/main/java/sugui/day04/Day04.java similarity index 100% rename from src/main/java/sugui/Day04.java rename to src/main/java/sugui/day04/Day04.java diff --git a/src/main/java/sugui/Day05.java b/src/main/java/sugui/day05/Day05.java similarity index 100% rename from src/main/java/sugui/Day05.java rename to src/main/java/sugui/day05/Day05.java diff --git a/src/main/java/sugui/Day06.java b/src/main/java/sugui/day06/Day06.java similarity index 100% rename from src/main/java/sugui/Day06.java rename to src/main/java/sugui/day06/Day06.java diff --git a/src/main/java/sugui/aux/Card.java b/src/main/java/sugui/day07/Card.java similarity index 64% rename from src/main/java/sugui/aux/Card.java rename to src/main/java/sugui/day07/Card.java index a90cc5c..2cc549c 100644 --- a/src/main/java/sugui/aux/Card.java +++ b/src/main/java/sugui/day07/Card.java @@ -1,4 +1,4 @@ -package sugui.aux; +package sugui.day07; public record Card(String label) { } diff --git a/src/main/java/sugui/aux/CardComparator.java b/src/main/java/sugui/day07/CardComparator.java similarity index 93% rename from src/main/java/sugui/aux/CardComparator.java rename to src/main/java/sugui/day07/CardComparator.java index 4d8e830..bb3229c 100644 --- a/src/main/java/sugui/aux/CardComparator.java +++ b/src/main/java/sugui/day07/CardComparator.java @@ -1,4 +1,4 @@ -package sugui.aux; +package sugui.day07; import java.util.Comparator; diff --git a/src/main/java/sugui/aux/CardWithJokerComparator.java b/src/main/java/sugui/day07/CardWithJokerComparator.java similarity index 93% rename from src/main/java/sugui/aux/CardWithJokerComparator.java rename to src/main/java/sugui/day07/CardWithJokerComparator.java index 8fa4144..0fcd516 100644 --- a/src/main/java/sugui/aux/CardWithJokerComparator.java +++ b/src/main/java/sugui/day07/CardWithJokerComparator.java @@ -1,4 +1,4 @@ -package sugui.aux; +package sugui.day07; import java.util.Comparator; diff --git a/src/main/java/sugui/Day07.java b/src/main/java/sugui/day07/Day07.java similarity index 93% rename from src/main/java/sugui/Day07.java rename to src/main/java/sugui/day07/Day07.java index 9a6f52b..9c2fd64 100644 --- a/src/main/java/sugui/Day07.java +++ b/src/main/java/sugui/day07/Day07.java @@ -1,4 +1,4 @@ -package sugui; +package sugui.day07; import java.io.BufferedReader; import java.io.IOException; @@ -9,11 +9,6 @@ import java.nio.file.Paths; import java.util.List; import java.util.stream.Collectors; -import sugui.aux.Card; -import sugui.aux.Hand; -import sugui.aux.HandComparator; -import sugui.aux.HandWithJokerComparator; - public class Day07 { public static Path inputPath = Paths.get("resources/input07.txt"); diff --git a/src/main/java/sugui/aux/Hand.java b/src/main/java/sugui/day07/Hand.java similarity index 92% rename from src/main/java/sugui/aux/Hand.java rename to src/main/java/sugui/day07/Hand.java index f041a79..115b532 100644 --- a/src/main/java/sugui/aux/Hand.java +++ b/src/main/java/sugui/day07/Hand.java @@ -1,4 +1,4 @@ -package sugui.aux; +package sugui.day07; public record Hand(Card c1, Card c2, Card c3, Card c4, Card c5, int bid) { diff --git a/src/main/java/sugui/aux/HandComparator.java b/src/main/java/sugui/day07/HandComparator.java similarity index 97% rename from src/main/java/sugui/aux/HandComparator.java rename to src/main/java/sugui/day07/HandComparator.java index e9017e2..162cc72 100644 --- a/src/main/java/sugui/aux/HandComparator.java +++ b/src/main/java/sugui/day07/HandComparator.java @@ -1,4 +1,4 @@ -package sugui.aux; +package sugui.day07; import java.util.ArrayList; import java.util.Comparator; @@ -7,7 +7,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Stream; -import sugui.aux.Hand.HandType; +import sugui.day07.Hand.HandType; public class HandComparator implements Comparator { diff --git a/src/main/java/sugui/aux/HandWithJokerComparator.java b/src/main/java/sugui/day07/HandWithJokerComparator.java similarity index 97% rename from src/main/java/sugui/aux/HandWithJokerComparator.java rename to src/main/java/sugui/day07/HandWithJokerComparator.java index 1e6cd62..6599317 100644 --- a/src/main/java/sugui/aux/HandWithJokerComparator.java +++ b/src/main/java/sugui/day07/HandWithJokerComparator.java @@ -1,4 +1,4 @@ -package sugui.aux; +package sugui.day07; import java.util.ArrayList; import java.util.Comparator; @@ -7,7 +7,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Stream; -import sugui.aux.Hand.HandType; +import sugui.day07.Hand.HandType; public class HandWithJokerComparator implements Comparator {