From 5d2027f7ed05aadd7a9e64f425f29c4ddb466b71 Mon Sep 17 00:00:00 2001 From: nonaninona Date: Fri, 4 Oct 2024 09:58:45 +0900 Subject: [PATCH 01/26] =?UTF-8?q?file=20:=20=EB=B6=88=ED=95=84=EC=9A=94=20?= =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 프로젝트 폴더가 하나 더 있음 --- .../.idea/.gitignore" | 8 ---- .../.idea/misc.xml" | 6 --- .../.idea/modules.xml" | 8 ---- .../.idea/vcs.xml" | 6 --- .../\354\235\264\355\230\204\355\235\254.iml" | 11 ----- .../LadderPractice/.idea/workspace.xml" | 44 ------------------- 6 files changed, 83 deletions(-) delete mode 100644 "\354\235\264\355\230\204\355\235\254/.idea/.gitignore" delete mode 100644 "\354\235\264\355\230\204\355\235\254/.idea/misc.xml" delete mode 100644 "\354\235\264\355\230\204\355\235\254/.idea/modules.xml" delete mode 100644 "\354\235\264\355\230\204\355\235\254/.idea/vcs.xml" delete mode 100644 "\354\235\264\355\230\204\355\235\254/.idea/\354\235\264\355\230\204\355\235\254.iml" delete mode 100644 "\354\235\264\355\230\204\355\235\254/LadderPractice/.idea/workspace.xml" diff --git "a/\354\235\264\355\230\204\355\235\254/.idea/.gitignore" "b/\354\235\264\355\230\204\355\235\254/.idea/.gitignore" deleted file mode 100644 index 13566b8..0000000 --- "a/\354\235\264\355\230\204\355\235\254/.idea/.gitignore" +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git "a/\354\235\264\355\230\204\355\235\254/.idea/misc.xml" "b/\354\235\264\355\230\204\355\235\254/.idea/misc.xml" deleted file mode 100644 index 69ace3f..0000000 --- "a/\354\235\264\355\230\204\355\235\254/.idea/misc.xml" +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git "a/\354\235\264\355\230\204\355\235\254/.idea/modules.xml" "b/\354\235\264\355\230\204\355\235\254/.idea/modules.xml" deleted file mode 100644 index 8a2c0de..0000000 --- "a/\354\235\264\355\230\204\355\235\254/.idea/modules.xml" +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git "a/\354\235\264\355\230\204\355\235\254/.idea/vcs.xml" "b/\354\235\264\355\230\204\355\235\254/.idea/vcs.xml" deleted file mode 100644 index 6c0b863..0000000 --- "a/\354\235\264\355\230\204\355\235\254/.idea/vcs.xml" +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git "a/\354\235\264\355\230\204\355\235\254/.idea/\354\235\264\355\230\204\355\235\254.iml" "b/\354\235\264\355\230\204\355\235\254/.idea/\354\235\264\355\230\204\355\235\254.iml" deleted file mode 100644 index b107a2d..0000000 --- "a/\354\235\264\355\230\204\355\235\254/.idea/\354\235\264\355\230\204\355\235\254.iml" +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git "a/\354\235\264\355\230\204\355\235\254/LadderPractice/.idea/workspace.xml" "b/\354\235\264\355\230\204\355\235\254/LadderPractice/.idea/workspace.xml" deleted file mode 100644 index 355a57d..0000000 --- "a/\354\235\264\355\230\204\355\235\254/LadderPractice/.idea/workspace.xml" +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - 1726808055522 - - - - - - \ No newline at end of file From 6ebc7d8cfe4229f2d09b1c92c4be60bad6b371db Mon Sep 17 00:00:00 2001 From: nonaninona Date: Fri, 4 Oct 2024 10:30:41 +0900 Subject: [PATCH 02/26] =?UTF-8?q?feat=20:=20=EB=8F=84=EB=A9=94=EC=9D=B8=20?= =?UTF-8?q?=EB=AA=A8=EB=8D=B8=20=EA=B0=9D=EC=B2=B4=20=EC=9D=B8=EC=8B=9D=20?= =?UTF-8?q?=EB=B0=8F=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/example/Main.java" | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" index 407f157..2760cb5 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" @@ -4,4 +4,25 @@ public class Main { public static void main(String[] args) { System.out.println("Hello world!"); } +} + + +class User { + +} + +class Game { + +} + +class Ladder { + +} + +class Row { + +} + +class Column { + } \ No newline at end of file From fa2e6e945edd0f9f8e107f36061873e25b7ad2e7 Mon Sep 17 00:00:00 2001 From: nonaninona Date: Fri, 4 Oct 2024 10:42:22 +0900 Subject: [PATCH 03/26] =?UTF-8?q?feat=20:=201=EB=B2=88=20=EB=A9=94?= =?UTF-8?q?=EC=8B=9C=EC=A7=80=EC=97=90=20=EB=8C=80=ED=95=9C=20=ED=98=91?= =?UTF-8?q?=EB=A0=A5=20=EA=B4=80=EA=B3=84=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1번 메시지 - 사다리를 만들어라 --- .../src/main/java/org/example/Main.java" | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" index 2760cb5..ad62f27 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" @@ -8,21 +8,25 @@ public static void main(String[] args) { class User { - + public void makeLadder(int width, int height) {} } class Game { - + public void makeLadder(int width, int height) {} } class Ladder { - -} - -class Row { - + public void makeLadder(int width, int height) {} } class Column { + public Column[] makeColumns(int width) { + return null; + } +} +class Row { + public Row[] makeRows(int height) { + return null; + } } \ No newline at end of file From 693c688f722ef79c63de4b82a919766e25634e26 Mon Sep 17 00:00:00 2001 From: nonaninona Date: Fri, 4 Oct 2024 10:44:34 +0900 Subject: [PATCH 04/26] =?UTF-8?q?feat=20:=203=EB=B2=88=20=EB=A9=94?= =?UTF-8?q?=EC=8B=9C=EC=A7=80=EC=97=90=20=EB=8C=80=ED=95=9C=20=ED=98=91?= =?UTF-8?q?=EB=A0=A5=20=EA=B4=80=EA=B3=84=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 3번 메시지 - 가로줄을 그어라 --- .../untitled/src/main/java/org/example/Main.java" | 5 +++++ 1 file changed, 5 insertions(+) diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" index ad62f27..3e2980b 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" @@ -9,24 +9,29 @@ public static void main(String[] args) { class User { public void makeLadder(int width, int height) {} + public void drawHorizontalLine(int row, int column) {} } class Game { public void makeLadder(int width, int height) {} + public void drawHorizontalLine(int row, int column) {} } class Ladder { public void makeLadder(int width, int height) {} + public void drawHorizontalLine(int row, int column) {} } class Column { public Column[] makeColumns(int width) { return null; } + public void drawHorizontalLine(int row) {} } class Row { public Row[] makeRows(int height) { return null; } + public void drawHorizontalLine() {} } \ No newline at end of file From 84f2efe85bc96bb00d047398539b0c5acde13ff1 Mon Sep 17 00:00:00 2001 From: nonaninona Date: Fri, 4 Oct 2024 10:46:03 +0900 Subject: [PATCH 05/26] =?UTF-8?q?feat=20:=202=EB=B2=88=20=EB=A9=94?= =?UTF-8?q?=EC=8B=9C=EC=A7=80=EC=97=90=20=EB=8C=80=ED=95=9C=20=ED=98=91?= =?UTF-8?q?=EB=A0=A5=20=EA=B4=80=EA=B3=84=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2번 메시지 - 실행해라 --- .../untitled/src/main/java/org/example/Main.java" | 3 +++ 1 file changed, 3 insertions(+) diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" index 3e2980b..7dd75b5 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" @@ -10,16 +10,19 @@ public static void main(String[] args) { class User { public void makeLadder(int width, int height) {} public void drawHorizontalLine(int row, int column) {} + public int runGame() { return -1; } } class Game { public void makeLadder(int width, int height) {} public void drawHorizontalLine(int row, int column) {} + public int runGame() { return -1; } } class Ladder { public void makeLadder(int width, int height) {} public void drawHorizontalLine(int row, int column) {} + public int runGame() { return -1; } } class Column { From 3f9d2dc02813b1219830749109cf8a8cbd76cb14 Mon Sep 17 00:00:00 2001 From: nonaninona Date: Fri, 4 Oct 2024 12:37:09 +0900 Subject: [PATCH 06/26] =?UTF-8?q?fix=20:=20=EC=82=AD=EC=A0=9C=EB=90=9C=20D?= =?UTF-8?q?rawer=20=EC=9D=B8=ED=84=B0=ED=8E=98=EC=9D=B4=EC=8A=A4=20import?= =?UTF-8?q?=EB=AC=B8=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../untitled/src/main/java/org/example/ladder/LadderDrawer.java" | 1 - 1 file changed, 1 deletion(-) diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ladder/LadderDrawer.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ladder/LadderDrawer.java" index 7284e36..f600f99 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ladder/LadderDrawer.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ladder/LadderDrawer.java" @@ -1,6 +1,5 @@ package org.example.ladder; -import org.example.Drawer; import org.example.row.Row; public class LadderDrawer { From 309bef6b6b72af5f23ba608ef230c55a92c370fd Mon Sep 17 00:00:00 2001 From: nonaninona Date: Fri, 4 Oct 2024 12:37:35 +0900 Subject: [PATCH 07/26] =?UTF-8?q?feat=20:=20=EB=A9=94=EC=8B=9C=EC=A7=80=20?= =?UTF-8?q?1=20=EA=B5=AC=ED=98=84=20=EC=A4=91=20=EC=88=98=EC=A0=95=20->=20?= =?UTF-8?q?=ED=8F=AC=ED=95=A8=EA=B4=80=EA=B3=84=EB=8A=94=20=EB=A6=AC?= =?UTF-8?q?=ED=84=B4=EC=9D=84=20=ED=95=98=EB=8A=94=20=EA=B2=8C=20=EC=95=84?= =?UTF-8?q?=EB=8B=88=EA=B3=A0=20=EC=83=9D=EC=84=B1=EC=9E=90=EB=A1=9C=20?= =?UTF-8?q?=EB=A6=AC=ED=84=B4=EC=9D=B4=20=EC=97=86=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EA=B5=AC=EC=84=B1=ED=95=98=EB=8A=94=20=EA=B2=8C=20=EB=A7=9E?= =?UTF-8?q?=EB=8A=94=20=EB=93=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/example/Main.java" | 34 ++++++++++++++----- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" index 7dd75b5..6c2b0e3 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" @@ -2,39 +2,57 @@ public class Main { public static void main(String[] args) { - System.out.println("Hello world!"); + User user = new User(); + Game game = new Game(); + + user.makeLadder(game, 3, 3); } } class User { - public void makeLadder(int width, int height) {} + public void makeLadder(Game game, int width, int height) { + game.makeLadder(width, height); + } public void drawHorizontalLine(int row, int column) {} public int runGame() { return -1; } } class Game { - public void makeLadder(int width, int height) {} + Ladder ladder = new Ladder(); + public void makeLadder(int width, int height) { + ladder.makeLadder(width, height); + } public void drawHorizontalLine(int row, int column) {} public int runGame() { return -1; } } class Ladder { - public void makeLadder(int width, int height) {} + Column[] columns; + public void makeLadder(int width, int height) { + columns = new Column[width]; + for (int i = 0; i < width; i++) { + columns[i] = new Column(height); + } + } public void drawHorizontalLine(int row, int column) {} public int runGame() { return -1; } } class Column { - public Column[] makeColumns(int width) { - return null; + Row[] rows; + public Column(int height) { + rows = new Row[height]; + for (int i = 0; i < rows.length; i++) { + rows[i] = new Row(); + } } public void drawHorizontalLine(int row) {} } class Row { - public Row[] makeRows(int height) { - return null; + public Row() { + } public void drawHorizontalLine() {} } \ No newline at end of file From ad8cbca7b1977d9c0527e95e8b37c20d5e7fd359 Mon Sep 17 00:00:00 2001 From: nonaninona Date: Fri, 4 Oct 2024 13:30:48 +0900 Subject: [PATCH 08/26] =?UTF-8?q?feat=20:=203=EB=B2=88=20=EB=A9=94?= =?UTF-8?q?=EC=8B=9C=EC=A7=80=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/example/Main.java" | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" index 6c2b0e3..1edc620 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" @@ -14,7 +14,9 @@ class User { public void makeLadder(Game game, int width, int height) { game.makeLadder(width, height); } - public void drawHorizontalLine(int row, int column) {} + public void drawHorizontalLine(Game game, int row, int column) { + game.drawHorizontalLine(row, column); + } public int runGame() { return -1; } } @@ -23,7 +25,9 @@ class Game { public void makeLadder(int width, int height) { ladder.makeLadder(width, height); } - public void drawHorizontalLine(int row, int column) {} + public void drawHorizontalLine(int row, int column) { + ladder.drawHorizontalLine(row, column); + } public int runGame() { return -1; } } @@ -35,7 +39,9 @@ public void makeLadder(int width, int height) { columns[i] = new Column(height); } } - public void drawHorizontalLine(int row, int column) {} + public void drawHorizontalLine(int row, int column) { + columns[column-1].drawHorizontalLine(row); + } public int runGame() { return -1; } } @@ -47,12 +53,17 @@ public Column(int height) { rows[i] = new Row(); } } - public void drawHorizontalLine(int row) {} + public void drawHorizontalLine(int row) { + rows[row-1].drawHorizontalLine(); + } } class Row { + boolean isLine; public Row() { - + this.isLine = false; + } + public void drawHorizontalLine() { + isLine = true; } - public void drawHorizontalLine() {} } \ No newline at end of file From 5c88c6a1daf01a9862df7b79efd9296e01593618 Mon Sep 17 00:00:00 2001 From: nonaninona Date: Fri, 4 Oct 2024 13:31:47 +0900 Subject: [PATCH 09/26] =?UTF-8?q?feat=20:=20=EB=8F=84=EB=A9=94=EC=9D=B8=20?= =?UTF-8?q?=EB=AA=A8=EB=8D=B8=20=EC=88=98=EC=A0=95(ladder=20-=20row=20-=20?= =?UTF-8?q?line=20=ED=98=95=ED=83=9C),=20=EC=9D=B8=ED=84=B0=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=8A=A4=20=EC=9E=AC=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 자꾸 ladder가 column의 자율성을 보장해주지 못함. calcResult에서 column의 상태값을 조회함 --- .../src/main/java/org/example/Main.java" | 56 +++++++++++-------- 1 file changed, 33 insertions(+), 23 deletions(-) diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" index 1edc620..7a17e2b 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" @@ -17,7 +17,9 @@ public void makeLadder(Game game, int width, int height) { public void drawHorizontalLine(Game game, int row, int column) { game.drawHorizontalLine(row, column); } - public int runGame() { return -1; } + public int runGame(Game game, int startColumn) { + return game.runGame(startColumn); + } } class Game { @@ -28,42 +30,50 @@ public void makeLadder(int width, int height) { public void drawHorizontalLine(int row, int column) { ladder.drawHorizontalLine(row, column); } - public int runGame() { return -1; } + public int runGame(int startColumn) { + return ladder.calcResult(startColumn); } } class Ladder { - Column[] columns; + Row[] rows; public void makeLadder(int width, int height) { - columns = new Column[width]; - for (int i = 0; i < width; i++) { - columns[i] = new Column(height); + rows = new Row[height]; + for (int i = 0; i < height; i++) { + rows[i] = new Row(width); } } public void drawHorizontalLine(int row, int column) { - columns[column-1].drawHorizontalLine(row); } - public int runGame() { return -1; } + public int calcResult(int startColumn) { + return -1; + } } -class Column { - Row[] rows; - public Column(int height) { - rows = new Row[height]; - for (int i = 0; i < rows.length; i++) { - rows[i] = new Row(); +class Row { + Line[] lines; + public Row(int width) { + lines = new Line[width]; + for (int i = 0; i < width; i++) { + lines[i] = new Line(); } } - public void drawHorizontalLine(int row) { - rows[row-1].drawHorizontalLine(); + public int calcResult(int startColumn) { + return -1; + } + public void drawLine(int column) { } } -class Row { - boolean isLine; - public Row() { - this.isLine = false; +class Line { + boolean isLineDrawed; + + public Line() { + isLineDrawed = false; } - public void drawHorizontalLine() { - isLine = true; + public void drawLine() { } -} \ No newline at end of file + public boolean checkIsLineDrawed() { + return false; + } +} + From 429c21688333253894c9bea8b4a3a90ed9a0264e Mon Sep 17 00:00:00 2001 From: nonaninona Date: Fri, 4 Oct 2024 13:33:15 +0900 Subject: [PATCH 10/26] =?UTF-8?q?feat=20:=203=EB=B2=88=20=EB=A9=94?= =?UTF-8?q?=EC=8B=9C=EC=A7=80=20=EC=9E=AC=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../untitled/src/main/java/org/example/Main.java" | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" index 7a17e2b..425d4d5 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" @@ -43,6 +43,7 @@ public void makeLadder(int width, int height) { } } public void drawHorizontalLine(int row, int column) { + rows[row-1].drawLine(column); } public int calcResult(int startColumn) { return -1; @@ -57,11 +58,16 @@ public Row(int width) { lines[i] = new Line(); } } + public void drawLine(int column) { + if(column - 2 >= 0 && lines[column-2].checkIsLineDrawed()) + return; + if(column <= lines.length -1 && lines[column].checkIsLineDrawed()) + return; + lines[column-1].drawLine(); + } public int calcResult(int startColumn) { return -1; } - public void drawLine(int column) { - } } class Line { @@ -71,6 +77,7 @@ public Line() { isLineDrawed = false; } public void drawLine() { + isLineDrawed = true; } public boolean checkIsLineDrawed() { return false; From 1fbef3aab94c7de2ddd5e58358e07efb0e5382d0 Mon Sep 17 00:00:00 2001 From: nonaninona Date: Fri, 4 Oct 2024 13:37:04 +0900 Subject: [PATCH 11/26] =?UTF-8?q?feat=20:=202=EB=B2=88=20=EB=A9=94?= =?UTF-8?q?=EC=8B=9C=EC=A7=80=20=EC=9E=AC=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/example/Main.java" | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" index 425d4d5..824bfe3 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" @@ -6,6 +6,8 @@ public static void main(String[] args) { Game game = new Game(); user.makeLadder(game, 3, 3); + user.drawHorizontalLine(game, 1, 1); + System.out.println(user.runGame(game, 1)); } } @@ -46,7 +48,11 @@ public void drawHorizontalLine(int row, int column) { rows[row-1].drawLine(column); } public int calcResult(int startColumn) { - return -1; + int result = startColumn; + for (int i = 0; i < rows.length; i++) { + result = rows[i].calcResult(result); + } + return result; } } @@ -66,7 +72,11 @@ public void drawLine(int column) { lines[column-1].drawLine(); } public int calcResult(int startColumn) { - return -1; + if(startColumn - 2 >= 0 && lines[startColumn-2].checkIsLineDrawed()) + return startColumn - 1; + if(lines[startColumn - 1].checkIsLineDrawed()) + return startColumn + 1; + return startColumn; } } @@ -80,7 +90,7 @@ public void drawLine() { isLineDrawed = true; } public boolean checkIsLineDrawed() { - return false; + return isLineDrawed; } } From e398befdacc50fa6e4a7a4833663481840d49eb9 Mon Sep 17 00:00:00 2001 From: nonaninona Date: Fri, 4 Oct 2024 13:46:18 +0900 Subject: [PATCH 12/26] =?UTF-8?q?feat=20:=204=EB=B2=88=20=EB=A9=94?= =?UTF-8?q?=EC=8B=9C=EC=A7=80=20=EC=9D=B8=ED=84=B0=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=8A=A4=20=EC=B6=94=EA=B0=80=20+=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/example/Main.java" | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" index 824bfe3..619de60 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" @@ -7,6 +7,7 @@ public static void main(String[] args) { user.makeLadder(game, 3, 3); user.drawHorizontalLine(game, 1, 1); + user.print(game); System.out.println(user.runGame(game, 1)); } } @@ -22,6 +23,9 @@ public void drawHorizontalLine(Game game, int row, int column) { public int runGame(Game game, int startColumn) { return game.runGame(startColumn); } + public void print(Game game) { + game.printLadder(); + } } class Game { @@ -33,7 +37,11 @@ public void drawHorizontalLine(int row, int column) { ladder.drawHorizontalLine(row, column); } public int runGame(int startColumn) { - return ladder.calcResult(startColumn); } + return ladder.calcResult(startColumn); + } + public void printLadder(){ + ladder.print(); + } } class Ladder { @@ -54,6 +62,11 @@ public int calcResult(int startColumn) { } return result; } + public void print() { + for (int i = 0; i < rows.length; i++) { + rows[i].print(); + } + } } class Row { @@ -78,6 +91,15 @@ public int calcResult(int startColumn) { return startColumn + 1; return startColumn; } + public void print() { + for (int i = 0; i < 2 * lines.length - 1; i++) { + if(i%2==0) + System.out.print("|"); + else + lines[(i-1)/2].print(); + } + System.out.println(); + } } class Line { @@ -92,5 +114,11 @@ public void drawLine() { public boolean checkIsLineDrawed() { return isLineDrawed; } + public void print() { + if(isLineDrawed) + System.out.print("-"); + else + System.out.print(" "); + } } From ba7105bffe5c91dbeaea0f492d3b4aa2cdc48c9f Mon Sep 17 00:00:00 2001 From: nonaninona Date: Fri, 4 Oct 2024 14:02:18 +0900 Subject: [PATCH 13/26] =?UTF-8?q?feat=20:=205=EB=B2=88=20=EB=A9=94?= =?UTF-8?q?=EC=8B=9C=EC=A7=80=20=EC=9D=B8=ED=84=B0=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=8A=A4=20=EC=B6=94=EA=B0=80=20+=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/example/Main.java" | 36 ++++++++++++++++--- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" index 619de60..6eeb183 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" @@ -1,14 +1,20 @@ package org.example; +import java.util.Random; + public class Main { public static void main(String[] args) { User user = new User(); - Game game = new Game(); + Game game1 = new Game(); + + user.makeLadder(game1, 3, 3); + user.drawHorizontalLine(game1, 1, 1); + user.print(game1); + System.out.println(user.runGame(game1, 1)); - user.makeLadder(game, 3, 3); - user.drawHorizontalLine(game, 1, 1); - user.print(game); - System.out.println(user.runGame(game, 1)); + Game game2 = new Game(); + user.makeLadderRandomly(game2, 5, 5); + user.print(game2); } } @@ -17,6 +23,9 @@ class User { public void makeLadder(Game game, int width, int height) { game.makeLadder(width, height); } + public void makeLadderRandomly(Game game, int width, int height) { + game.makeLadderRandomly(width, height); + } public void drawHorizontalLine(Game game, int row, int column) { game.drawHorizontalLine(row, column); } @@ -33,6 +42,9 @@ class Game { public void makeLadder(int width, int height) { ladder.makeLadder(width, height); } + public void makeLadderRandomly(int width, int height) { + ladder.makeLadderRandomly(width, height); + } public void drawHorizontalLine(int row, int column) { ladder.drawHorizontalLine(row, column); } @@ -52,6 +64,20 @@ public void makeLadder(int width, int height) { rows[i] = new Row(width); } } + public void makeLadderRandomly(int width, int height) { + rows = new Row[height]; + for (int i = 0; i < height; i++) { + rows[i] = new Row(width); + } + Random random = new Random(); + System.out.println(width*height*0.3); + for(int i=0;i Date: Fri, 4 Oct 2024 14:05:28 +0900 Subject: [PATCH 14/26] =?UTF-8?q?file=20:=20=ED=8F=B4=EB=8D=94=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=B0=8F=20=EC=9C=84=EC=B9=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/example/Main.java" | 136 +----------------- .../src/main/java/org/example/ver2/Game.java" | 20 +++ .../main/java/org/example/ver2/Ladder.java" | 42 ++++++ .../src/main/java/org/example/ver2/Line.java" | 21 +++ .../src/main/java/org/example/ver2/Row.java" | 34 +++++ .../src/main/java/org/example/ver2/User.java" | 19 +++ 6 files changed, 140 insertions(+), 132 deletions(-) create mode 100644 "\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Game.java" create mode 100644 "\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Ladder.java" create mode 100644 "\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Line.java" create mode 100644 "\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Row.java" create mode 100644 "\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/User.java" diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" index 6eeb183..8e995ce 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" @@ -1,5 +1,8 @@ package org.example; +import org.example.ver2.Game; +import org.example.ver2.User; + import java.util.Random; public class Main { @@ -16,135 +19,4 @@ public static void main(String[] args) { user.makeLadderRandomly(game2, 5, 5); user.print(game2); } -} - - -class User { - public void makeLadder(Game game, int width, int height) { - game.makeLadder(width, height); - } - public void makeLadderRandomly(Game game, int width, int height) { - game.makeLadderRandomly(width, height); - } - public void drawHorizontalLine(Game game, int row, int column) { - game.drawHorizontalLine(row, column); - } - public int runGame(Game game, int startColumn) { - return game.runGame(startColumn); - } - public void print(Game game) { - game.printLadder(); - } -} - -class Game { - Ladder ladder = new Ladder(); - public void makeLadder(int width, int height) { - ladder.makeLadder(width, height); - } - public void makeLadderRandomly(int width, int height) { - ladder.makeLadderRandomly(width, height); - } - public void drawHorizontalLine(int row, int column) { - ladder.drawHorizontalLine(row, column); - } - public int runGame(int startColumn) { - return ladder.calcResult(startColumn); - } - public void printLadder(){ - ladder.print(); - } -} - -class Ladder { - Row[] rows; - public void makeLadder(int width, int height) { - rows = new Row[height]; - for (int i = 0; i < height; i++) { - rows[i] = new Row(width); - } - } - public void makeLadderRandomly(int width, int height) { - rows = new Row[height]; - for (int i = 0; i < height; i++) { - rows[i] = new Row(width); - } - Random random = new Random(); - System.out.println(width*height*0.3); - for(int i=0;i= 0 && lines[column-2].checkIsLineDrawed()) - return; - if(column <= lines.length -1 && lines[column].checkIsLineDrawed()) - return; - lines[column-1].drawLine(); - } - public int calcResult(int startColumn) { - if(startColumn - 2 >= 0 && lines[startColumn-2].checkIsLineDrawed()) - return startColumn - 1; - if(lines[startColumn - 1].checkIsLineDrawed()) - return startColumn + 1; - return startColumn; - } - public void print() { - for (int i = 0; i < 2 * lines.length - 1; i++) { - if(i%2==0) - System.out.print("|"); - else - lines[(i-1)/2].print(); - } - System.out.println(); - } -} - -class Line { - boolean isLineDrawed; - - public Line() { - isLineDrawed = false; - } - public void drawLine() { - isLineDrawed = true; - } - public boolean checkIsLineDrawed() { - return isLineDrawed; - } - public void print() { - if(isLineDrawed) - System.out.print("-"); - else - System.out.print(" "); - } -} - +} \ No newline at end of file diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Game.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Game.java" new file mode 100644 index 0000000..543d048 --- /dev/null +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Game.java" @@ -0,0 +1,20 @@ +package org.example.ver2; + +public class Game { + Ladder ladder = new Ladder(); + public void makeLadder(int width, int height) { + ladder.makeLadder(width, height); + } + public void makeLadderRandomly(int width, int height) { + ladder.makeLadderRandomly(width, height); + } + public void drawHorizontalLine(int row, int column) { + ladder.drawHorizontalLine(row, column); + } + public int runGame(int startColumn) { + return ladder.calcResult(startColumn); + } + public void printLadder(){ + ladder.print(); + } +} diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Ladder.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Ladder.java" new file mode 100644 index 0000000..4aa2346 --- /dev/null +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Ladder.java" @@ -0,0 +1,42 @@ +package org.example.ver2; + +import java.util.Random; + +public class Ladder { + Row[] rows; + public void makeLadder(int width, int height) { + rows = new org.example.Row[height]; + for (int i = 0; i < height; i++) { + rows[i] = new org.example.Row(width); + } + } + public void makeLadderRandomly(int width, int height) { + rows = new org.example.Row[height]; + for (int i = 0; i < height; i++) { + rows[i] = new org.example.Row(width); + } + Random random = new Random(); + System.out.println(width*height*0.3); + for(int i=0;i= 0 && lines[column-2].checkIsLineDrawed()) + return; + if(column <= lines.length -1 && lines[column].checkIsLineDrawed()) + return; + lines[column-1].drawLine(); + } + public int calcResult(int startColumn) { + if(startColumn - 2 >= 0 && lines[startColumn-2].checkIsLineDrawed()) + return startColumn - 1; + if(lines[startColumn - 1].checkIsLineDrawed()) + return startColumn + 1; + return startColumn; + } + public void print() { + for (int i = 0; i < 2 * lines.length - 1; i++) { + if(i%2==0) + System.out.print("|"); + else + lines[(i-1)/2].print(); + } + System.out.println(); + } +} diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/User.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/User.java" new file mode 100644 index 0000000..c98e85a --- /dev/null +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/User.java" @@ -0,0 +1,19 @@ +package org.example.ver2; + +public class User { + public void makeLadder(Game game, int width, int height) { + game.makeLadder(width, height); + } + public void makeLadderRandomly(Game game, int width, int height) { + game.makeLadderRandomly(width, height); + } + public void drawHorizontalLine(Game game, int row, int column) { + game.drawHorizontalLine(row, column); + } + public int runGame(Game game, int startColumn) { + return game.runGame(startColumn); + } + public void print(Game game) { + game.printLadder(); + } +} From 5287f20d47b3037897abfeb38c0e5f433fb00308 Mon Sep 17 00:00:00 2001 From: nonaninona Date: Fri, 4 Oct 2024 14:06:22 +0900 Subject: [PATCH 15/26] =?UTF-8?q?file=20:=20=EC=83=81=ED=83=9C=EC=9D=98=20?= =?UTF-8?q?=EC=A0=91=EA=B7=BC=20=EC=A0=9C=ED=95=9C=EC=9E=90=20private?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../untitled/src/main/java/org/example/ver2/Game.java" | 2 +- .../src/main/java/org/example/ver2/Ladder.java" | 10 +++++----- .../untitled/src/main/java/org/example/ver2/Line.java" | 3 +-- .../untitled/src/main/java/org/example/ver2/Row.java" | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Game.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Game.java" index 543d048..1315a39 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Game.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Game.java" @@ -1,7 +1,7 @@ package org.example.ver2; public class Game { - Ladder ladder = new Ladder(); + private Ladder ladder = new Ladder(); public void makeLadder(int width, int height) { ladder.makeLadder(width, height); } diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Ladder.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Ladder.java" index 4aa2346..5e59b1b 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Ladder.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Ladder.java" @@ -3,17 +3,17 @@ import java.util.Random; public class Ladder { - Row[] rows; + private Row[] rows; public void makeLadder(int width, int height) { - rows = new org.example.Row[height]; + rows = new Row[height]; for (int i = 0; i < height; i++) { - rows[i] = new org.example.Row(width); + rows[i] = new Row(width); } } public void makeLadderRandomly(int width, int height) { - rows = new org.example.Row[height]; + rows = new Row[height]; for (int i = 0; i < height; i++) { - rows[i] = new org.example.Row(width); + rows[i] = new Row(width); } Random random = new Random(); System.out.println(width*height*0.3); diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Line.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Line.java" index 691693c..e3ca1fb 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Line.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Line.java" @@ -1,8 +1,7 @@ package org.example.ver2; public class Line { - boolean isLineDrawed; - + private boolean isLineDrawed; public Line() { isLineDrawed = false; } diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Row.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Row.java" index f28ac68..3e155cd 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Row.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Row.java" @@ -1,7 +1,7 @@ package org.example.ver2; public class Row { - Line[] lines; + private Line[] lines; public Row(int width) { lines = new Line[width]; for (int i = 0; i < width; i++) { From 898fe83634a099236fc5e4fc9bca2452f086bb6e Mon Sep 17 00:00:00 2001 From: nonaninona Date: Fri, 4 Oct 2024 15:06:58 +0900 Subject: [PATCH 16/26] =?UTF-8?q?refact=20:=20ladder=EC=9D=98=20=EC=82=AC?= =?UTF-8?q?=EB=8B=A4=EB=A6=AC=20=EC=83=9D=EC=84=B1=20=EC=B1=85=EC=9E=84?= =?UTF-8?q?=EC=9D=84=20ladder=20Creator=EB=A1=9C=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/example/ver2/Ladder.java" | 19 ++---------- .../java/org/example/ver2/LadderCreator.java" | 31 +++++++++++++++++++ 2 files changed, 34 insertions(+), 16 deletions(-) create mode 100644 "\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderCreator.java" diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Ladder.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Ladder.java" index 5e59b1b..09a72ef 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Ladder.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Ladder.java" @@ -4,25 +4,12 @@ public class Ladder { private Row[] rows; + private LadderCreator ladderCreator; public void makeLadder(int width, int height) { - rows = new Row[height]; - for (int i = 0; i < height; i++) { - rows[i] = new Row(width); - } + rows = ladderCreator.makeLadder(width, height); } public void makeLadderRandomly(int width, int height) { - rows = new Row[height]; - for (int i = 0; i < height; i++) { - rows[i] = new Row(width); - } - Random random = new Random(); - System.out.println(width*height*0.3); - for(int i=0;i Date: Tue, 8 Oct 2024 17:05:22 +0900 Subject: [PATCH 17/26] =?UTF-8?q?refact=20:=20LadderCreator=EB=A5=BC=20Lad?= =?UTF-8?q?der=EC=97=90=EC=84=9C=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit LadderCreator의 메소드가 Ladder를 만들어 Ladder를 리턴하도록 함 --- .../untitled/src/main/java/org/example/ver2/Game.java" | 6 +++--- .../untitled/src/main/java/org/example/ver2/Ladder.java" | 8 ++------ .../src/main/java/org/example/ver2/LadderCreator.java" | 9 ++++++--- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Game.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Game.java" index 1315a39..d6e1f71 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Game.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Game.java" @@ -1,12 +1,12 @@ package org.example.ver2; public class Game { - private Ladder ladder = new Ladder(); + private Ladder ladder; public void makeLadder(int width, int height) { - ladder.makeLadder(width, height); + ladder = new LadderCreator().makeLadder(width, height); } public void makeLadderRandomly(int width, int height) { - ladder.makeLadderRandomly(width, height); + ladder = new LadderCreator().makeLadderRandomly(width, height); } public void drawHorizontalLine(int row, int column) { ladder.drawHorizontalLine(row, column); diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Ladder.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Ladder.java" index 09a72ef..2c8dfc0 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Ladder.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Ladder.java" @@ -4,12 +4,8 @@ public class Ladder { private Row[] rows; - private LadderCreator ladderCreator; - public void makeLadder(int width, int height) { - rows = ladderCreator.makeLadder(width, height); - } - public void makeLadderRandomly(int width, int height) { - ladderCreator.makeLadderRandomly(width, height); + public Ladder(Row[] rows) { + this.rows = rows; } public void drawHorizontalLine(int row, int column) { rows[row-1].drawLine(column); diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderCreator.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderCreator.java" index 347d94e..89ad8ba 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderCreator.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderCreator.java" @@ -3,14 +3,15 @@ import java.util.Random; public class LadderCreator { - public Row[] makeLadder(int width, int height) { + public Ladder makeLadder(int width, int height) { Row[] rows = new Row[height]; for (int i = 0; i < height; i++) { rows[i] = new Row(width); } - return rows; + + return new Ladder(rows); } - public void makeLadderRandomly(int width, int height) { + public Ladder makeLadderRandomly(int width, int height) { Row[] rows = new Row[height]; rows = new Row[height]; for (int i = 0; i < height; i++) { @@ -24,6 +25,8 @@ public void makeLadderRandomly(int width, int height) { System.out.println(row + " " + column); drawHorizontalLine(rows, row, column); } + + return new Ladder(rows); } private void drawHorizontalLine(Row[] rows, int row, int column) { rows[row-1].drawLine(column); From 9c7244b4b8fed712b5b8401b51e3ce9b42fb5da3 Mon Sep 17 00:00:00 2001 From: nonaninona Date: Tue, 8 Oct 2024 17:11:36 +0900 Subject: [PATCH 18/26] =?UTF-8?q?refact=20:=20=EB=9E=9C=EB=8D=A4=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EC=8B=9C=20=ED=8A=B9=EC=A0=95=20=EA=B0=9C?= =?UTF-8?q?=EC=88=98=EB=A7=8C=ED=81=BC=20=EC=84=A0=EC=9D=84=20=EA=B8=8B?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=B3=B4=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit drawLine이 리턴 값을 가지도록 함 --- .../untitled/src/main/java/org/example/Main.java" | 1 + .../src/main/java/org/example/ver2/Game.java" | 4 ++-- .../src/main/java/org/example/ver2/Ladder.java" | 4 ++-- .../java/org/example/ver2/LadderCreator.java" | 15 +++++++++------ .../src/main/java/org/example/ver2/Line.java" | 9 +++++++-- .../src/main/java/org/example/ver2/Row.java" | 8 ++++---- .../src/main/java/org/example/ver2/User.java" | 4 ++-- 7 files changed, 27 insertions(+), 18 deletions(-) diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" index 8e995ce..42920e1 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" @@ -14,6 +14,7 @@ public static void main(String[] args) { user.drawHorizontalLine(game1, 1, 1); user.print(game1); System.out.println(user.runGame(game1, 1)); + System.out.println(); Game game2 = new Game(); user.makeLadderRandomly(game2, 5, 5); diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Game.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Game.java" index d6e1f71..3424df1 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Game.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Game.java" @@ -8,8 +8,8 @@ public void makeLadder(int width, int height) { public void makeLadderRandomly(int width, int height) { ladder = new LadderCreator().makeLadderRandomly(width, height); } - public void drawHorizontalLine(int row, int column) { - ladder.drawHorizontalLine(row, column); + public boolean drawHorizontalLine(int row, int column) { + return ladder.drawHorizontalLine(row, column); } public int runGame(int startColumn) { return ladder.calcResult(startColumn); diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Ladder.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Ladder.java" index 2c8dfc0..c5f9974 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Ladder.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Ladder.java" @@ -7,8 +7,8 @@ public class Ladder { public Ladder(Row[] rows) { this.rows = rows; } - public void drawHorizontalLine(int row, int column) { - rows[row-1].drawLine(column); + public boolean drawHorizontalLine(int row, int column) { + return rows[row-1].drawLine(column); } public int calcResult(int startColumn) { int result = startColumn; diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderCreator.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderCreator.java" index 89ad8ba..0e8a45c 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderCreator.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderCreator.java" @@ -13,22 +13,25 @@ public Ladder makeLadder(int width, int height) { } public Ladder makeLadderRandomly(int width, int height) { Row[] rows = new Row[height]; - rows = new Row[height]; for (int i = 0; i < height; i++) { rows[i] = new Row(width); } Random random = new Random(); System.out.println(width*height*0.3); - for(int i=0;i= 0 && lines[column-2].checkIsLineDrawed()) - return; + return false; if(column <= lines.length -1 && lines[column].checkIsLineDrawed()) - return; - lines[column-1].drawLine(); + return false; + return lines[column-1].drawLine(); } public int calcResult(int startColumn) { if(startColumn - 2 >= 0 && lines[startColumn-2].checkIsLineDrawed()) diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/User.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/User.java" index c98e85a..e1c66f0 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/User.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/User.java" @@ -7,8 +7,8 @@ public void makeLadder(Game game, int width, int height) { public void makeLadderRandomly(Game game, int width, int height) { game.makeLadderRandomly(width, height); } - public void drawHorizontalLine(Game game, int row, int column) { - game.drawHorizontalLine(row, column); + public boolean drawHorizontalLine(Game game, int row, int column) { + return game.drawHorizontalLine(row, column); } public int runGame(Game game, int startColumn) { return game.runGame(startColumn); From 7d395f446a261ea902b4f57caadd1fc57e1718cb Mon Sep 17 00:00:00 2001 From: nonaninona Date: Tue, 8 Oct 2024 17:12:53 +0900 Subject: [PATCH 19/26] =?UTF-8?q?refact=20:=20makeLadder=20=EB=A9=94?= =?UTF-8?q?=EC=86=8C=EB=93=9C=EB=A5=BC=20static=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../untitled/src/main/java/org/example/ver2/Game.java" | 4 ++-- .../src/main/java/org/example/ver2/LadderCreator.java" | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Game.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Game.java" index 3424df1..d35d9a7 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Game.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Game.java" @@ -3,10 +3,10 @@ public class Game { private Ladder ladder; public void makeLadder(int width, int height) { - ladder = new LadderCreator().makeLadder(width, height); + ladder = LadderCreator.makeLadder(width, height); } public void makeLadderRandomly(int width, int height) { - ladder = new LadderCreator().makeLadderRandomly(width, height); + ladder = LadderCreator.makeLadderRandomly(width, height); } public boolean drawHorizontalLine(int row, int column) { return ladder.drawHorizontalLine(row, column); diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderCreator.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderCreator.java" index 0e8a45c..2a4cfff 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderCreator.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderCreator.java" @@ -3,7 +3,7 @@ import java.util.Random; public class LadderCreator { - public Ladder makeLadder(int width, int height) { + public static Ladder makeLadder(int width, int height) { Row[] rows = new Row[height]; for (int i = 0; i < height; i++) { rows[i] = new Row(width); @@ -11,7 +11,7 @@ public Ladder makeLadder(int width, int height) { return new Ladder(rows); } - public Ladder makeLadderRandomly(int width, int height) { + public static Ladder makeLadderRandomly(int width, int height) { Row[] rows = new Row[height]; for (int i = 0; i < height; i++) { rows[i] = new Row(width); @@ -31,7 +31,7 @@ public Ladder makeLadderRandomly(int width, int height) { return new Ladder(rows); } - private boolean drawHorizontalLine(Row[] rows, int row, int column) { + private static boolean drawHorizontalLine(Row[] rows, int row, int column) { return rows[row-1].drawLine(column); } } From 0f6044e0b58723a8a356671491927ca0d9f42379 Mon Sep 17 00:00:00 2001 From: nonaninona Date: Tue, 8 Oct 2024 17:22:26 +0900 Subject: [PATCH 20/26] =?UTF-8?q?refact=20:=20LadderCreator=20=EC=9D=B8?= =?UTF-8?q?=ED=84=B0=ED=8E=98=EC=9D=B4=EC=8A=A4=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?=EB=B0=8F=20Game=EC=9D=B4=20DI=20=EB=B0=9B=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/example/Main.java" | 8 +++-- .../src/main/java/org/example/ver2/Game.java" | 9 ++--- .../org/example/ver2/LadderBasicCreator.java" | 12 +++++++ .../java/org/example/ver2/LadderCreator.java" | 33 ++----------------- .../example/ver2/LadderRandomCreator.java" | 29 ++++++++++++++++ .../src/main/java/org/example/ver2/User.java" | 3 -- 6 files changed, 53 insertions(+), 41 deletions(-) create mode 100644 "\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderBasicCreator.java" create mode 100644 "\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderRandomCreator.java" diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" index 42920e1..d0f4d40 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" @@ -1,6 +1,8 @@ package org.example; import org.example.ver2.Game; +import org.example.ver2.LadderBasicCreator; +import org.example.ver2.LadderRandomCreator; import org.example.ver2.User; import java.util.Random; @@ -8,7 +10,7 @@ public class Main { public static void main(String[] args) { User user = new User(); - Game game1 = new Game(); + Game game1 = new Game(new LadderBasicCreator()); user.makeLadder(game1, 3, 3); user.drawHorizontalLine(game1, 1, 1); @@ -16,8 +18,8 @@ public static void main(String[] args) { System.out.println(user.runGame(game1, 1)); System.out.println(); - Game game2 = new Game(); - user.makeLadderRandomly(game2, 5, 5); + Game game2 = new Game(new LadderRandomCreator()); + user.makeLadder(game2, 5, 5); user.print(game2); } } \ No newline at end of file diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Game.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Game.java" index d35d9a7..0e0a211 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Game.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/Game.java" @@ -2,11 +2,12 @@ public class Game { private Ladder ladder; - public void makeLadder(int width, int height) { - ladder = LadderCreator.makeLadder(width, height); + private LadderCreator ladderCreator; + public Game(LadderCreator ladderCreator) { + this.ladderCreator = ladderCreator; } - public void makeLadderRandomly(int width, int height) { - ladder = LadderCreator.makeLadderRandomly(width, height); + public void makeLadder(int width, int height) { + ladder = ladderCreator.makeLadder(width, height); } public boolean drawHorizontalLine(int row, int column) { return ladder.drawHorizontalLine(row, column); diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderBasicCreator.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderBasicCreator.java" new file mode 100644 index 0000000..d6d5fd7 --- /dev/null +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderBasicCreator.java" @@ -0,0 +1,12 @@ +package org.example.ver2; + +public class LadderBasicCreator implements LadderCreator{ + public Ladder makeLadder(int width, int height) { + Row[] rows = new Row[height]; + for (int i = 0; i < height; i++) { + rows[i] = new Row(width); + } + + return new Ladder(rows); + } +} diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderCreator.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderCreator.java" index 2a4cfff..f707a81 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderCreator.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderCreator.java" @@ -2,36 +2,7 @@ import java.util.Random; -public class LadderCreator { - public static Ladder makeLadder(int width, int height) { - Row[] rows = new Row[height]; - for (int i = 0; i < height; i++) { - rows[i] = new Row(width); - } +interface LadderCreator { - return new Ladder(rows); - } - public static Ladder makeLadderRandomly(int width, int height) { - Row[] rows = new Row[height]; - for (int i = 0; i < height; i++) { - rows[i] = new Row(width); - } - Random random = new Random(); - System.out.println(width*height*0.3); - for(int i=0;i Date: Tue, 8 Oct 2024 17:23:56 +0900 Subject: [PATCH 21/26] =?UTF-8?q?feat=20:=20main=20=EB=82=B4=EC=9A=A9=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../untitled/src/main/java/org/example/Main.java" | 4 ++++ 1 file changed, 4 insertions(+) diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" index d0f4d40..9148e25 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" @@ -5,6 +5,7 @@ import org.example.ver2.LadderRandomCreator; import org.example.ver2.User; +import javax.swing.*; import java.util.Random; public class Main { @@ -15,11 +16,14 @@ public static void main(String[] args) { user.makeLadder(game1, 3, 3); user.drawHorizontalLine(game1, 1, 1); user.print(game1); + System.out.println("startColumn : 1"); System.out.println(user.runGame(game1, 1)); System.out.println(); Game game2 = new Game(new LadderRandomCreator()); user.makeLadder(game2, 5, 5); user.print(game2); + System.out.println("startColumn : 1"); + System.out.println(user.runGame(game2, 1)); } } \ No newline at end of file From b4034e00286177876624a709ffeeb41c0668d974 Mon Sep 17 00:00:00 2001 From: nonaninona Date: Tue, 8 Oct 2024 17:24:15 +0900 Subject: [PATCH 22/26] =?UTF-8?q?style=20:=20random=20creator=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/example/ver2/LadderRandomCreator.java" | 2 -- 1 file changed, 2 deletions(-) diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderRandomCreator.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderRandomCreator.java" index 14369eb..71ff35a 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderRandomCreator.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderRandomCreator.java" @@ -16,8 +16,6 @@ public Ladder makeLadder(int width, int height) { if(!drawHorizontalLine(rows, row, column)) { i--; continue; - } else { - System.out.println(row + " " + column); } } From 54659603362f2388dc66bf458cea79c9c33d34e9 Mon Sep 17 00:00:00 2001 From: nonaninona Date: Tue, 8 Oct 2024 17:26:35 +0900 Subject: [PATCH 23/26] =?UTF-8?q?refact=20:=20=EC=A0=95=EC=A0=81=20?= =?UTF-8?q?=ED=8C=A9=ED=86=A0=EB=A6=AC=20=EB=A9=94=EC=84=9C=EB=93=9C=20?= =?UTF-8?q?=ED=8C=A8=ED=84=B4=20=EC=82=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../untitled/src/main/java/org/example/Main.java" | 9 +++------ .../main/java/org/example/ver2/LadderGameFactory.java" | 10 ++++++++++ 2 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 "\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderGameFactory.java" diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" index 9148e25..a35c7c9 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" @@ -1,9 +1,6 @@ package org.example; -import org.example.ver2.Game; -import org.example.ver2.LadderBasicCreator; -import org.example.ver2.LadderRandomCreator; -import org.example.ver2.User; +import org.example.ver2.*; import javax.swing.*; import java.util.Random; @@ -11,7 +8,7 @@ public class Main { public static void main(String[] args) { User user = new User(); - Game game1 = new Game(new LadderBasicCreator()); + Game game1 = LadderGameFactory.createBasicLadderGame(); user.makeLadder(game1, 3, 3); user.drawHorizontalLine(game1, 1, 1); @@ -20,7 +17,7 @@ public static void main(String[] args) { System.out.println(user.runGame(game1, 1)); System.out.println(); - Game game2 = new Game(new LadderRandomCreator()); + Game game2 = LadderGameFactory.createRandomLadderGame(); user.makeLadder(game2, 5, 5); user.print(game2); System.out.println("startColumn : 1"); diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderGameFactory.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderGameFactory.java" new file mode 100644 index 0000000..8de28e7 --- /dev/null +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderGameFactory.java" @@ -0,0 +1,10 @@ +package org.example.ver2; + +public class LadderGameFactory { + public static Game createRandomLadderGame() { + return new Game(new LadderRandomCreator()); + } + public static Game createBasicLadderGame() { + return new Game(new LadderBasicCreator()); + } +} From ac3552497f76086d8eb2e3d1cdd64d9903ebad3a Mon Sep 17 00:00:00 2001 From: nonaninona Date: Tue, 8 Oct 2024 17:30:19 +0900 Subject: [PATCH 24/26] =?UTF-8?q?fix=20:=20LadderCreator=20=EC=A0=91?= =?UTF-8?q?=EA=B7=BC=20=EC=A0=9C=ED=95=9C=EC=9E=90=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../untitled/src/main/java/org/example/ver2/LadderCreator.java" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderCreator.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderCreator.java" index f707a81..c216a8a 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderCreator.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderCreator.java" @@ -2,7 +2,7 @@ import java.util.Random; -interface LadderCreator { +public interface LadderCreator { public Ladder makeLadder(int width, int height); } From 4c49d7cfac3d8e0bed0114059633f6cae4e30d14 Mon Sep 17 00:00:00 2001 From: nonaninona Date: Tue, 8 Oct 2024 18:12:06 +0900 Subject: [PATCH 25/26] =?UTF-8?q?refact=20:=20LadderGameFactory=20->=20Gam?= =?UTF-8?q?eFactory=EB=A1=9C=20=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD,=20?= =?UTF-8?q?User=EC=99=80=20Game=20=EC=97=B0=EA=B4=80=EA=B4=80=EA=B3=84=20?= =?UTF-8?q?=ED=91=9C=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/example/Main.java" | 22 ++++++++----------- .../java/org/example/ver2/GameFactory.java" | 2 +- .../src/main/java/org/example/ver2/User.java" | 15 +++++++++---- 3 files changed, 21 insertions(+), 18 deletions(-) rename "\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderGameFactory.java" => "\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/GameFactory.java" (88%) diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" index a35c7c9..b790647 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/Main.java" @@ -2,25 +2,21 @@ import org.example.ver2.*; -import javax.swing.*; -import java.util.Random; - public class Main { public static void main(String[] args) { - User user = new User(); - Game game1 = LadderGameFactory.createBasicLadderGame(); + User user = new User(GameFactory.createBasicLadderGame()); - user.makeLadder(game1, 3, 3); - user.drawHorizontalLine(game1, 1, 1); - user.print(game1); + user.makeLadder(3, 3); + user.drawHorizontalLine(1, 1); + user.print(); System.out.println("startColumn : 1"); - System.out.println(user.runGame(game1, 1)); + System.out.println(user.runGame(1)); System.out.println(); - Game game2 = LadderGameFactory.createRandomLadderGame(); - user.makeLadder(game2, 5, 5); - user.print(game2); + user.setGame(GameFactory.createRandomLadderGame()); + user.makeLadder(5, 5); + user.print(); System.out.println("startColumn : 1"); - System.out.println(user.runGame(game2, 1)); + System.out.println(user.runGame(1)); } } \ No newline at end of file diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderGameFactory.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/GameFactory.java" similarity index 88% rename from "\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderGameFactory.java" rename to "\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/GameFactory.java" index 8de28e7..3be0d30 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderGameFactory.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/GameFactory.java" @@ -1,6 +1,6 @@ package org.example.ver2; -public class LadderGameFactory { +public class GameFactory { public static Game createRandomLadderGame() { return new Game(new LadderRandomCreator()); } diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/User.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/User.java" index 5ee14f0..dfcc6cf 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/User.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/User.java" @@ -1,16 +1,23 @@ package org.example.ver2; public class User { - public void makeLadder(Game game, int width, int height) { + private Game game; + public User(Game game) { + this.game = game; + } + public void setGame(Game game) { + this.game = game; + } + public void makeLadder(int width, int height) { game.makeLadder(width, height); } - public boolean drawHorizontalLine(Game game, int row, int column) { + public boolean drawHorizontalLine(int row, int column) { return game.drawHorizontalLine(row, column); } - public int runGame(Game game, int startColumn) { + public int runGame(int startColumn) { return game.runGame(startColumn); } - public void print(Game game) { + public void print() { game.printLadder(); } } From 78b00dee9aedb9a54bb1c520de63d150225424f5 Mon Sep 17 00:00:00 2001 From: nonaninona Date: Tue, 8 Oct 2024 18:13:51 +0900 Subject: [PATCH 26/26] =?UTF-8?q?style=20:=20interface=EB=8A=94=20?= =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=EC=A0=9C=ED=95=9C=EC=9E=90=EA=B0=80=20pub?= =?UTF-8?q?lic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../untitled/src/main/java/org/example/ver2/LadderCreator.java" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderCreator.java" "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderCreator.java" index c216a8a..7345d56 100644 --- "a/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderCreator.java" +++ "b/\354\235\264\355\230\204\355\235\254/untitled/src/main/java/org/example/ver2/LadderCreator.java" @@ -4,5 +4,5 @@ public interface LadderCreator { - public Ladder makeLadder(int width, int height); + Ladder makeLadder(int width, int height); }