From a17dbb29b5bc561195cea1b9ba35646fca7591f1 Mon Sep 17 00:00:00 2001 From: yangyanghyunjung Date: Thu, 12 Oct 2023 22:07:49 +0900 Subject: [PATCH 01/37] test commit --- Test/README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Test/README.md diff --git a/Test/README.md b/Test/README.md new file mode 100644 index 0000000000..7d5a96a066 --- /dev/null +++ b/Test/README.md @@ -0,0 +1,3 @@ +# Git 연결 확인 test +--- +:raised_hand: \ No newline at end of file From 78c1188926345037ca98a95cfdff2caa749d0f41 Mon Sep 17 00:00:00 2001 From: yangyanghyunjung Date: Thu, 12 Oct 2023 22:15:04 +0900 Subject: [PATCH 02/37] =?UTF-8?q?=EA=B3=BC=EC=97=B0=20=EC=84=B1=EA=B3=B5?= =?UTF-8?q?=3F=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Test/README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Test/README.md b/Test/README.md index 7d5a96a066..adcb7763a0 100644 --- a/Test/README.md +++ b/Test/README.md @@ -1,3 +1,2 @@ -# Git 연결 확인 test ---- -:raised_hand: \ No newline at end of file +

Hello World

+
this is test to checkout branchgit
\ No newline at end of file From afdb9b7f1deb9594739d3e8d9a547140a502f708 Mon Sep 17 00:00:00 2001 From: yang Date: Fri, 13 Oct 2023 09:43:22 +0900 Subject: [PATCH 03/37] =?UTF-8?q?=EC=BB=A4=EB=B0=8B=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Test/README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Test/README.md b/Test/README.md index 7d5a96a066..a555ac76b8 100644 --- a/Test/README.md +++ b/Test/README.md @@ -1,3 +1,4 @@ -# Git 연결 확인 test ---- -:raised_hand: \ No newline at end of file +# Git 연결 확인 test2 +- - - +- hellogut +- hi \ No newline at end of file From 6d33639b69279c5ec3600b41c3994f7177d96c52 Mon Sep 17 00:00:00 2001 From: yang Date: Fri, 13 Oct 2023 09:54:12 +0900 Subject: [PATCH 04/37] =?UTF-8?q?Revert=20"=EC=BB=A4=EB=B0=8B=EC=BB=A4?= =?UTF-8?q?=EB=B0=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit afdb9b7f1deb9594739d3e8d9a547140a502f708. --- Test/README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Test/README.md b/Test/README.md index a555ac76b8..7d5a96a066 100644 --- a/Test/README.md +++ b/Test/README.md @@ -1,4 +1,3 @@ -# Git 연결 확인 test2 -- - - -- hellogut -- hi \ No newline at end of file +# Git 연결 확인 test +--- +:raised_hand: \ No newline at end of file From 4c87a520050069e91d09d106211e84dfdbc6d7bf Mon Sep 17 00:00:00 2001 From: yang Date: Fri, 13 Oct 2023 09:55:21 +0900 Subject: [PATCH 05/37] =?UTF-8?q?com=20=EC=BB=A4=EB=B0=8B=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Test/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Test/README.md b/Test/README.md index 7d5a96a066..2c361a35fd 100644 --- a/Test/README.md +++ b/Test/README.md @@ -1,3 +1,4 @@ # Git 연결 확인 test --- -:raised_hand: \ No newline at end of file +:raised_hand: +- 안녕 \ No newline at end of file From 4abe54ba55baa5a3d065b1daf25d463121f5a37f Mon Sep 17 00:00:00 2001 From: yang Date: Fri, 13 Oct 2023 15:22:20 +0900 Subject: [PATCH 06/37] =?UTF-8?q?onbarding=5Fproblem1=20=EC=99=84=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/hi/Compare.java | 12 ++ src/main/java/hi/Page.java | 28 +++ src/main/java/hi/Score.java | 40 ++++ src/main/java/onboarding/Problem1.java | 7 +- src/test/java/onboarding/ApplicationTest.java | 192 +++++++++--------- 5 files changed, 185 insertions(+), 94 deletions(-) create mode 100644 src/main/java/hi/Compare.java create mode 100644 src/main/java/hi/Page.java create mode 100644 src/main/java/hi/Score.java diff --git a/src/main/java/hi/Compare.java b/src/main/java/hi/Compare.java new file mode 100644 index 0000000000..1fd7f31165 --- /dev/null +++ b/src/main/java/hi/Compare.java @@ -0,0 +1,12 @@ +package hi; + +public class Compare { + public int CompareScore(Integer largePobiScore ,Integer largeCrongScore) { + if (largePobiScore < largeCrongScore) { + return 2; + } else if (largePobiScore > largeCrongScore) { + return 1; + } + return 0; + } +} diff --git a/src/main/java/hi/Page.java b/src/main/java/hi/Page.java new file mode 100644 index 0000000000..129d0e4616 --- /dev/null +++ b/src/main/java/hi/Page.java @@ -0,0 +1,28 @@ +package hi; + +import java.util.List; +import hi.Score; + +public class Page { + private static final int MIN = 3; + private static final int MAX =398; + + public int PageValidation (List pobi, List crong) { + int pobiLeft = pobi.get(0); + int pobiRight = pobi.get(1); + int crongLeft = crong.get(0); + int crongRight = crong.get(1); + + if (pobiRight - pobiLeft != 1 || crongRight - crongLeft != 1) { + return -1; + } + if (pobiLeft < MIN || pobiLeft > MAX || crongLeft < MIN || crongLeft > MAX + || pobiRight < MIN || pobiRight > MAX || crongRight < MIN || crongRight > MAX) { + return -1; + } + Score score = new Score(); + int win = score.LargeScore(pobiLeft, pobiRight, crongLeft, crongRight); + + return win; + } +} \ No newline at end of file diff --git a/src/main/java/hi/Score.java b/src/main/java/hi/Score.java new file mode 100644 index 0000000000..ef5c28cfbc --- /dev/null +++ b/src/main/java/hi/Score.java @@ -0,0 +1,40 @@ +package hi; + +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; + +public class Score { + public Integer LargeScore(Integer pobiLeft, Integer pobiRight, Integer crongLeft, Integer crongRight) { + + int largePobiScoreLeft = Calculate(pobiLeft); + int largePobiScoreRight = Calculate(pobiRight); + int largeCrongScoreLeft = Calculate(crongLeft); + int largeCrongScoreRight = Calculate(crongRight); + + int largePobiScore = largePobiScoreLeft < largePobiScoreRight ? largePobiScoreRight : largePobiScoreLeft; + int largeCrongScore = largeCrongScoreLeft < largeCrongScoreRight ? largeCrongScoreRight : largeCrongScoreLeft; + + Compare compare = new Compare(); + int win = compare.CompareScore(largePobiScore, largeCrongScore); + + return win; + } + public int Calculate (int score) { + LinkedList scoreLists = new LinkedList<>(); + while (score > 0) { + scoreLists.push(score % 10); + score /= 10; + } + int add = 0; + int mul = 1; + for (int i = 0; i < scoreLists.size(); i++) { + add += scoreLists.get(i); + mul *= scoreLists.get(i); + } + + return add < mul ? mul : add; + } +} + + diff --git a/src/main/java/onboarding/Problem1.java b/src/main/java/onboarding/Problem1.java index b99e6b5e67..b4deee9f4f 100644 --- a/src/main/java/onboarding/Problem1.java +++ b/src/main/java/onboarding/Problem1.java @@ -1,10 +1,13 @@ package onboarding; import java.util.List; +import hi.Page; class Problem1 { public static int solution(List pobi, List crong) { - int answer = Integer.MAX_VALUE; - return answer; + Page page = new Page(); + int score = page.PageValidation(pobi, crong); + System.out.println(score); + return score; } } \ No newline at end of file diff --git a/src/test/java/onboarding/ApplicationTest.java b/src/test/java/onboarding/ApplicationTest.java index 4cdf3ed0ef..0e8a82599f 100644 --- a/src/test/java/onboarding/ApplicationTest.java +++ b/src/test/java/onboarding/ApplicationTest.java @@ -33,101 +33,109 @@ void case3() { int result = -1; assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); } - } - - @Nested - class Problem2Test { - @Test - void case1() { - String cryptogram = "browoanoommnaon"; - String result = "brown"; - assertThat(Problem2.solution(cryptogram)).isEqualTo(result); - } - - @Test - void case2() { - String cryptogram = "zyelleyz"; - String result = ""; - assertThat(Problem2.solution(cryptogram)).isEqualTo(result); - } - } - - @Nested - class Problem3Test { - @Test - void case1() { - int number = 13; - int result = 4; - assertThat(Problem3.solution(number)).isEqualTo(result); - } - - @Test - void case2() { - int number = 33; - int result = 14; - assertThat(Problem3.solution(number)).isEqualTo(result); - } - } - - @Nested - class Problem4Test { - @Test - void case1() { - String word = "I love you"; - String result = "R olev blf"; - assertThat(Problem4.solution(word)).isEqualTo(result); - } - } - - @Nested - class Problem5Test { - @Test - void case1() { - int money = 50_237; - List result = List.of(1, 0, 0, 0, 0, 2, 0, 3, 7); - assertThat(Problem5.solution(money)).isEqualTo(result); - } @Test - void case2() { - int money = 15_000; - List result = List.of(0, 1, 1, 0, 0, 0, 0, 0, 0); - assertThat(Problem5.solution(money)).isEqualTo(result); - } - } - - @Nested - class Problem6Test { - @Test - void case1() { - List> forms = List.of( - List.of("jm@email.com", "제이엠"), - List.of("jason@email.com", "제이슨"), - List.of("woniee@email.com", "워니"), - List.of("mj@email.com", "엠제이"), - List.of("nowm@email.com", "이제엠") - ); - List result = List.of("jason@email.com", "jm@email.com", "mj@email.com"); - assertThat(Problem6.solution(forms)).isEqualTo(result); + void case4() { + List pobi = List.of(1,2); + List crong = List.of(399,400); + int result = -1; + assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); } } - @Nested - class Problem7Test { - @Test - void case1() { - String user = "mrko"; - List> friends = List.of( - List.of("donut", "andole"), - List.of("donut", "jun"), - List.of("donut", "mrko"), - List.of("shakevan", "andole"), - List.of("shakevan", "jun"), - List.of("shakevan", "mrko") - ); - List visitors = List.of("bedi", "bedi", "donut", "bedi", "shakevan"); - List result = List.of("andole", "jun", "bedi"); - assertThat(Problem7.solution(user, friends, visitors)).isEqualTo(result); - } - } +// @Nested +// class Problem2Test { +// @Test +// void case1() { +// String cryptogram = "browoanoommnaon"; +// String result = "brown"; +// assertThat(Problem2.solution(cryptogram)).isEqualTo(result); +// } +// +// @Test +// void case2() { +// String cryptogram = "zyelleyz"; +// String result = ""; +// assertThat(Problem2.solution(cryptogram)).isEqualTo(result); +// } +// } +// +// @Nested +// class Problem3Test { +// @Test +// void case1() { +// int number = 13; +// int result = 4; +// assertThat(Problem3.solution(number)).isEqualTo(result); +// } +// +// @Test +// void case2() { +// int number = 33; +// int result = 14; +// assertThat(Problem3.solution(number)).isEqualTo(result); +// } +// } +// +// @Nested +// class Problem4Test { +// @Test +// void case1() { +// String word = "I love you"; +// String result = "R olev blf"; +// assertThat(Problem4.solution(word)).isEqualTo(result); +// } +// } +// +// @Nested +// class Problem5Test { +// @Test +// void case1() { +// int money = 50_237; +// List result = List.of(1, 0, 0, 0, 0, 2, 0, 3, 7); +// assertThat(Problem5.solution(money)).isEqualTo(result); +// } +// +// @Test +// void case2() { +// int money = 15_000; +// List result = List.of(0, 1, 1, 0, 0, 0, 0, 0, 0); +// assertThat(Problem5.solution(money)).isEqualTo(result); +// } +// } +// +// @Nested +// class Problem6Test { +// @Test +// void case1() { +// List> forms = List.of( +// List.of("jm@email.com", "제이엠"), +// List.of("jason@email.com", "제이슨"), +// List.of("woniee@email.com", "워니"), +// List.of("mj@email.com", "엠제이"), +// List.of("nowm@email.com", "이제엠") +// ); +// List result = List.of("jason@email.com", "jm@email.com", "mj@email.com"); +// assertThat(Problem6.solution(forms)).isEqualTo(result); +// } +// } +// +// @Nested +// class Problem7Test { +// @Test +// void case1() { +// String user = "mrko"; +// List> friends = List.of( +// List.of("donut", "andole"), +// List.of("donut", "jun"), +// List.of("donut", "mrko"), +// List.of("shakevan", "andole"), +// List.of("shakevan", "jun"), +// List.of("shakevan", "mrko") +// ); +// List visitors = List.of("bedi", "bedi", "donut", "bedi", "shakevan"); +// List result = List.of("andole", "jun", "bedi"); +// assertThat(Problem7.solution(user, friends, visitors)).isEqualTo(result); +// } +// } } From a1926eb59e25273f72b1fd087a7968b94f7c1dc0 Mon Sep 17 00:00:00 2001 From: yang Date: Mon, 16 Oct 2023 10:36:23 +0900 Subject: [PATCH 07/37] =?UTF-8?q?=EA=B8=B0=EB=8A=A5=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Problem2/functionList.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/main/java/Problem2/functionList.md diff --git a/src/main/java/Problem2/functionList.md b/src/main/java/Problem2/functionList.md new file mode 100644 index 0000000000..6d5f33a535 --- /dev/null +++ b/src/main/java/Problem2/functionList.md @@ -0,0 +1,16 @@ +# 🚀 problem2 기능 목록 +- - - +### 1. StringValidation +```java +System.out.println("예외"); +``` +- 글자수가 **1**이하 **1000** 이상일 경우 +- **대문자**가 들어올 경우 +- 빈문자열 값: ```return 빈문자열``` +- - - +### 2. FindAndRemoveDuplicate +- **LinkedList**로 첫 문자부터 순회 +- 반복문자 나올 시 next node **포인터 변경** (삭제) +- 반복이 없다면 다음 node로 이동 +- ```return 최종 문자열``` + \ No newline at end of file From fd19d693aa1b8ba34dc4cc4be49f070ff95679c8 Mon Sep 17 00:00:00 2001 From: yang Date: Mon, 16 Oct 2023 10:53:04 +0900 Subject: [PATCH 08/37] =?UTF-8?q?StringValidation=20=EA=B8=B0=EB=8A=A5=20c?= =?UTF-8?q?ommit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Problem2/StringValidation.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/main/java/Problem2/StringValidation.java diff --git a/src/main/java/Problem2/StringValidation.java b/src/main/java/Problem2/StringValidation.java new file mode 100644 index 0000000000..1e4e965312 --- /dev/null +++ b/src/main/java/Problem2/StringValidation.java @@ -0,0 +1,18 @@ +package Problem2; + +public class StringValidation { + public boolean Validate (String cryptogram) { + // 문자열 길이 오류 + if (cryptogram.length() < 1 || cryptogram.length() > 1000) { + return false; + } + // 대문자 포함될 경우 + char[] charArray = cryptogram.toCharArray(); + for (int i = 0; i < charArray.length; i++) { + if (Character.isUpperCase(charArray[i])) { + return false; + } + } + return true; + } +} From a40e9edb04fc3e9e2211f8c48aef014ae934774f Mon Sep 17 00:00:00 2001 From: yang Date: Mon, 16 Oct 2023 10:54:34 +0900 Subject: [PATCH 09/37] =?UTF-8?q?FindAndRemoveDuplicate=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=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/Problem2/FindAndRemoveDuplicate.java | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/main/java/Problem2/FindAndRemoveDuplicate.java diff --git a/src/main/java/Problem2/FindAndRemoveDuplicate.java b/src/main/java/Problem2/FindAndRemoveDuplicate.java new file mode 100644 index 0000000000..b20b73ae29 --- /dev/null +++ b/src/main/java/Problem2/FindAndRemoveDuplicate.java @@ -0,0 +1,9 @@ +package Problem2; + +public class FindAndRemoveDuplicate { + public String FindAndRemve (String cryptogram) + { + + return ""; + } +} From 4ae9fc598b2ed8497fc31f1db314c20a52770ebd Mon Sep 17 00:00:00 2001 From: yang Date: Mon, 16 Oct 2023 16:49:13 +0900 Subject: [PATCH 10/37] =?UTF-8?q?FindAndRemoveDuplicate=20=EC=A4=91?= =?UTF-8?q?=EB=B3=B5=EA=B0=92=20=EC=82=AD=EC=A0=9C=20=EA=B8=B0=EB=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/Problem2/FindAndRemoveDuplicate.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/Problem2/FindAndRemoveDuplicate.java b/src/main/java/Problem2/FindAndRemoveDuplicate.java index b20b73ae29..cb62f64ca0 100644 --- a/src/main/java/Problem2/FindAndRemoveDuplicate.java +++ b/src/main/java/Problem2/FindAndRemoveDuplicate.java @@ -1,9 +1,20 @@ package Problem2; +import java.util.ArrayList; +import java.util.Arrays; public class FindAndRemoveDuplicate { public String FindAndRemve (String cryptogram) { - - return ""; + String[] cryptogramArray = cryptogram.split(""); + ArrayList cryptogramList = new ArrayList(Arrays.asList(cryptogramArray)); + for (int i = 0; i Date: Mon, 16 Oct 2023 16:50:55 +0900 Subject: [PATCH 11/37] =?UTF-8?q?=EC=BD=94=EB=93=9C=EB=A6=AC=EB=B7=B0=202j?= =?UTF-8?q?un0's=20=EC=A4=91=EB=B3=B5=EA=B0=92=20=EC=A0=9C=EA=B1=B0=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Problem2/eJun0SSockSSock.java | 35 +++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/main/java/Problem2/eJun0SSockSSock.java diff --git a/src/main/java/Problem2/eJun0SSockSSock.java b/src/main/java/Problem2/eJun0SSockSSock.java new file mode 100644 index 0000000000..97c1041580 --- /dev/null +++ b/src/main/java/Problem2/eJun0SSockSSock.java @@ -0,0 +1,35 @@ +package Problem2; + +import java.util.Stack; + +public class eJun0SSockSSock { + // 2jun0's Code + // 1. Stack 생성 + // 2. for문 순회 + // 3. push || pop + + public String ConvertStackToString(Stack stack) { + StringBuilder sb = new StringBuilder(); + // 후입선출 고려 0번째 index에 add가 아닌 insert 해줌. + while (!stack.isEmpty()) { //모두 pop() 되면 종료 + // pop()은 제거하면서 sb에 insert도 가능한가봄 + sb.insert(0,stack.pop()); + } + return sb.toString(); + } + public String RemoveDuplicate(String cryptogram) { + Stack stack = new Stack(); + + for (char c: cryptogram.toCharArray()) { + // 나는 문자열 비교시 equals ( 참조형 비교 위해) 썼는데 char은 기본형이라 == 시용 가능 + if (stack.size() > 0 && stack.peek().equals(c)) { + stack.pop(); + } else { + stack.push(c); + } + } + return ConvertStackToString(stack); + } + + +} From 39fd647291330027679065cc3dcda1a35f64c9c7 Mon Sep 17 00:00:00 2001 From: yang Date: Mon, 16 Oct 2023 16:51:20 +0900 Subject: [PATCH 12/37] =?UTF-8?q?Test=20code=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/onboarding/ApplicationTest.java | 89 ++++++++++--------- 1 file changed, 48 insertions(+), 41 deletions(-) diff --git a/src/test/java/onboarding/ApplicationTest.java b/src/test/java/onboarding/ApplicationTest.java index 0e8a82599f..976c44b560 100644 --- a/src/test/java/onboarding/ApplicationTest.java +++ b/src/test/java/onboarding/ApplicationTest.java @@ -8,58 +8,65 @@ import static org.assertj.core.api.Assertions.assertThat; class ApplicationTest { +// @Nested +// class Problem1Test { +// @Test +// void case1() { +// List pobi = List.of(97, 98); +// List crong = List.of(197, 198); +// int result = 0; +// assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); +// } +// +// @Test +// void case2() { +// List pobi = List.of(131, 132); +// List crong = List.of(211, 212); +// int result = 1; +// assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); +// } +// +// @Test +// void case3() { +// List pobi = List.of(99, 102); +// List crong = List.of(211, 212); +// int result = -1; +// assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); +// } +// +// @Test +// void case4() { +// List pobi = List.of(1,2); +// List crong = List.of(399,400); +// int result = -1; +// assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); +// } +// } + @Nested - class Problem1Test { + class Problem2Test { @Test void case1() { - List pobi = List.of(97, 98); - List crong = List.of(197, 198); - int result = 0; - assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); + String cryptogram = "browoanoommnaon"; + String result = "brown"; + assertThat(Problem2.solution(cryptogram)).isEqualTo(result); } @Test void case2() { - List pobi = List.of(131, 132); - List crong = List.of(211, 212); - int result = 1; - assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); + String cryptogram = "zyelleyz"; + String result = ""; + assertThat(Problem2.solution(cryptogram)).isEqualTo(result); } @Test void case3() { - List pobi = List.of(99, 102); - List crong = List.of(211, 212); - int result = -1; - assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); - } - - @Test - void case4() { - List pobi = List.of(1,2); - List crong = List.of(399,400); - int result = -1; - assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); + String cryptogram = ""; + String result = ""; + assertThat(Problem2.solution(cryptogram)).isEqualTo(result); } } -// @Nested -// class Problem2Test { -// @Test -// void case1() { -// String cryptogram = "browoanoommnaon"; -// String result = "brown"; -// assertThat(Problem2.solution(cryptogram)).isEqualTo(result); -// } -// -// @Test -// void case2() { -// String cryptogram = "zyelleyz"; -// String result = ""; -// assertThat(Problem2.solution(cryptogram)).isEqualTo(result); -// } -// } -// // @Nested // class Problem3Test { // @Test @@ -86,7 +93,7 @@ void case4() { // assertThat(Problem4.solution(word)).isEqualTo(result); // } // } -// + // @Nested // class Problem5Test { // @Test @@ -103,7 +110,7 @@ void case4() { // assertThat(Problem5.solution(money)).isEqualTo(result); // } // } -// + // @Nested // class Problem6Test { // @Test @@ -119,7 +126,7 @@ void case4() { // assertThat(Problem6.solution(forms)).isEqualTo(result); // } // } -// + // @Nested // class Problem7Test { // @Test From c85be62b4c02826f9579e05e7e536a87bbff60c1 Mon Sep 17 00:00:00 2001 From: yang Date: Mon, 16 Oct 2023 16:51:49 +0900 Subject: [PATCH 13/37] =?UTF-8?q?Problem2=20Main=ED=95=A8=EC=88=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/onboarding/Problem2.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/onboarding/Problem2.java b/src/main/java/onboarding/Problem2.java index ee836e9cac..6f3c5c18e1 100644 --- a/src/main/java/onboarding/Problem2.java +++ b/src/main/java/onboarding/Problem2.java @@ -1,8 +1,21 @@ package onboarding; +import Problem2.StringValidation; +import Problem2.FindAndRemoveDuplicate; +import Problem2.eJun0SSockSSock; public class Problem2 { public static String solution(String cryptogram) { - String answer = "answer"; - return answer; + // 문자열 validation check return boolean + StringValidation stringValidation = new StringValidation(); + if (!stringValidation.Validate(cryptogram)) { + return ""; + } + // validation check 값이 true면 중복 삭제 +// FindAndRemoveDuplicate FRD = new FindAndRemoveDuplicate(); +// String result = FRD.FindAndRemve(cryptogram); + //2jun0's + eJun0SSockSSock ejun0 = new eJun0SSockSSock(); + String result = ejun0.RemoveDuplicate(cryptogram); + return result; } } From 8c8fae312dc28ff0d5ea281612be4f9ec1ea1c9c Mon Sep 17 00:00:00 2001 From: yangyanghyunjung Date: Tue, 17 Oct 2023 08:43:39 +0900 Subject: [PATCH 14/37] =?UTF-8?q?=EC=B6=A9=EB=8F=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/onboarding/ApplicationTest.java | 225 +++++++++--------- 1 file changed, 109 insertions(+), 116 deletions(-) diff --git a/src/test/java/onboarding/ApplicationTest.java b/src/test/java/onboarding/ApplicationTest.java index 976c44b560..a871e58a95 100644 --- a/src/test/java/onboarding/ApplicationTest.java +++ b/src/test/java/onboarding/ApplicationTest.java @@ -8,40 +8,40 @@ import static org.assertj.core.api.Assertions.assertThat; class ApplicationTest { -// @Nested -// class Problem1Test { -// @Test -// void case1() { -// List pobi = List.of(97, 98); -// List crong = List.of(197, 198); -// int result = 0; -// assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); -// } -// -// @Test -// void case2() { -// List pobi = List.of(131, 132); -// List crong = List.of(211, 212); -// int result = 1; -// assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); -// } -// -// @Test -// void case3() { -// List pobi = List.of(99, 102); -// List crong = List.of(211, 212); -// int result = -1; -// assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); -// } -// -// @Test -// void case4() { -// List pobi = List.of(1,2); -// List crong = List.of(399,400); -// int result = -1; -// assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); -// } -// } + @Nested + class Problem1Test { + @Test + void case1() { + List pobi = List.of(97, 98); + List crong = List.of(197, 198); + int result = 0; + assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); + } + + @Test + void case2() { + List pobi = List.of(131, 132); + List crong = List.of(211, 212); + int result = 1; + assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); + } + + @Test + void case3() { + List pobi = List.of(99, 102); + List crong = List.of(211, 212); + int result = -1; + assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); + } + + @Test + void case4() { + List pobi = List.of(1,2); + List crong = List.of(399,400); + int result = -1; + assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); + } + } @Nested class Problem2Test { @@ -58,91 +58,84 @@ void case2() { String result = ""; assertThat(Problem2.solution(cryptogram)).isEqualTo(result); } + } + @Nested + class Problem3Test { @Test - void case3() { - String cryptogram = ""; - String result = ""; - assertThat(Problem2.solution(cryptogram)).isEqualTo(result); + void case1() { + int number = 13; + int result = 4; + assertThat(Problem3.solution(number)).isEqualTo(result); + } + + @Test + void case2() { + int number = 33; + int result = 14; + assertThat(Problem3.solution(number)).isEqualTo(result); } } -// @Nested -// class Problem3Test { -// @Test -// void case1() { -// int number = 13; -// int result = 4; -// assertThat(Problem3.solution(number)).isEqualTo(result); -// } -// -// @Test -// void case2() { -// int number = 33; -// int result = 14; -// assertThat(Problem3.solution(number)).isEqualTo(result); -// } -// } -// -// @Nested -// class Problem4Test { -// @Test -// void case1() { -// String word = "I love you"; -// String result = "R olev blf"; -// assertThat(Problem4.solution(word)).isEqualTo(result); -// } -// } - -// @Nested -// class Problem5Test { -// @Test -// void case1() { -// int money = 50_237; -// List result = List.of(1, 0, 0, 0, 0, 2, 0, 3, 7); -// assertThat(Problem5.solution(money)).isEqualTo(result); -// } -// -// @Test -// void case2() { -// int money = 15_000; -// List result = List.of(0, 1, 1, 0, 0, 0, 0, 0, 0); -// assertThat(Problem5.solution(money)).isEqualTo(result); -// } -// } - -// @Nested -// class Problem6Test { -// @Test -// void case1() { -// List> forms = List.of( -// List.of("jm@email.com", "제이엠"), -// List.of("jason@email.com", "제이슨"), -// List.of("woniee@email.com", "워니"), -// List.of("mj@email.com", "엠제이"), -// List.of("nowm@email.com", "이제엠") -// ); -// List result = List.of("jason@email.com", "jm@email.com", "mj@email.com"); -// assertThat(Problem6.solution(forms)).isEqualTo(result); -// } -// } - -// @Nested -// class Problem7Test { -// @Test -// void case1() { -// String user = "mrko"; -// List> friends = List.of( -// List.of("donut", "andole"), -// List.of("donut", "jun"), -// List.of("donut", "mrko"), -// List.of("shakevan", "andole"), -// List.of("shakevan", "jun"), -// List.of("shakevan", "mrko") -// ); -// List visitors = List.of("bedi", "bedi", "donut", "bedi", "shakevan"); -// List result = List.of("andole", "jun", "bedi"); -// assertThat(Problem7.solution(user, friends, visitors)).isEqualTo(result); -// } -// } + @Nested + class Problem4Test { + @Test + void case1() { + String word = "I love you"; + String result = "R olev blf"; + assertThat(Problem4.solution(word)).isEqualTo(result); + } + } + + @Nested + class Problem5Test { + @Test + void case1() { + int money = 50_237; + List result = List.of(1, 0, 0, 0, 0, 2, 0, 3, 7); + assertThat(Problem5.solution(money)).isEqualTo(result); + } + + @Test + void case2() { + int money = 15_000; + List result = List.of(0, 1, 1, 0, 0, 0, 0, 0, 0); + assertThat(Problem5.solution(money)).isEqualTo(result); + } + } + + @Nested + class Problem6Test { + @Test + void case1() { + List> forms = List.of( + List.of("jm@email.com", "제이엠"), + List.of("jason@email.com", "제이슨"), + List.of("woniee@email.com", "워니"), + List.of("mj@email.com", "엠제이"), + List.of("nowm@email.com", "이제엠") + ); + List result = List.of("jason@email.com", "jm@email.com", "mj@email.com"); + assertThat(Problem6.solution(forms)).isEqualTo(result); + } + } + + @Nested + class Problem7Test { + @Test + void case1() { + String user = "mrko"; + List> friends = List.of( + List.of("donut", "andole"), + List.of("donut", "jun"), + List.of("donut", "mrko"), + List.of("shakevan", "andole"), + List.of("shakevan", "jun"), + List.of("shakevan", "mrko") + ); + List visitors = List.of("bedi", "bedi", "donut", "bedi", "shakevan"); + List result = List.of("andole", "jun", "bedi"); + assertThat(Problem7.solution(user, friends, visitors)).isEqualTo(result); + } + } } From 662d6145ddf3889a7e07d0b0857c14d851f310b1 Mon Sep 17 00:00:00 2001 From: yangyanghyunjung Date: Tue, 17 Oct 2023 08:54:01 +0900 Subject: [PATCH 15/37] =?UTF-8?q?FindAndRemoveDuplicate=20=EC=B6=A9?= =?UTF-8?q?=EB=8F=8C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Problem2/FindAndRemoveDuplicate.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/Problem2/FindAndRemoveDuplicate.java b/src/main/java/Problem2/FindAndRemoveDuplicate.java index cb62f64ca0..8bd259b4d9 100644 --- a/src/main/java/Problem2/FindAndRemoveDuplicate.java +++ b/src/main/java/Problem2/FindAndRemoveDuplicate.java @@ -1,12 +1,11 @@ package Problem2; import java.util.ArrayList; import java.util.Arrays; - public class FindAndRemoveDuplicate { public String FindAndRemve (String cryptogram) { String[] cryptogramArray = cryptogram.split(""); - ArrayList cryptogramList = new ArrayList(Arrays.asList(cryptogramArray)); + ArrayList cryptogramList = new ArrayList<>(Arrays.asList(cryptogramArray)); for (int i = 0; i Date: Tue, 17 Oct 2023 08:57:24 +0900 Subject: [PATCH 16/37] =?UTF-8?q?FindAndRemoveDuplicate=20=EC=B6=A9?= =?UTF-8?q?=EB=8F=8C=20=ED=95=B4=EA=B2=B02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Problem2/FindAndRemoveDuplicate.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/Problem2/FindAndRemoveDuplicate.java b/src/main/java/Problem2/FindAndRemoveDuplicate.java index 8bd259b4d9..cb62f64ca0 100644 --- a/src/main/java/Problem2/FindAndRemoveDuplicate.java +++ b/src/main/java/Problem2/FindAndRemoveDuplicate.java @@ -1,11 +1,12 @@ package Problem2; import java.util.ArrayList; import java.util.Arrays; + public class FindAndRemoveDuplicate { public String FindAndRemve (String cryptogram) { String[] cryptogramArray = cryptogram.split(""); - ArrayList cryptogramList = new ArrayList<>(Arrays.asList(cryptogramArray)); + ArrayList cryptogramList = new ArrayList(Arrays.asList(cryptogramArray)); for (int i = 0; i Date: Tue, 17 Oct 2023 08:59:59 +0900 Subject: [PATCH 17/37] =?UTF-8?q?Test=EC=BD=94=EB=93=9C=20=EC=B6=A9?= =?UTF-8?q?=EB=8F=8C=20=ED=95=B4=EA=B2=B02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/onboarding/ApplicationTest.java | 190 +++++++++--------- 1 file changed, 95 insertions(+), 95 deletions(-) diff --git a/src/test/java/onboarding/ApplicationTest.java b/src/test/java/onboarding/ApplicationTest.java index a871e58a95..0e8a82599f 100644 --- a/src/test/java/onboarding/ApplicationTest.java +++ b/src/test/java/onboarding/ApplicationTest.java @@ -43,99 +43,99 @@ void case4() { } } - @Nested - class Problem2Test { - @Test - void case1() { - String cryptogram = "browoanoommnaon"; - String result = "brown"; - assertThat(Problem2.solution(cryptogram)).isEqualTo(result); - } - - @Test - void case2() { - String cryptogram = "zyelleyz"; - String result = ""; - assertThat(Problem2.solution(cryptogram)).isEqualTo(result); - } - } - - @Nested - class Problem3Test { - @Test - void case1() { - int number = 13; - int result = 4; - assertThat(Problem3.solution(number)).isEqualTo(result); - } - - @Test - void case2() { - int number = 33; - int result = 14; - assertThat(Problem3.solution(number)).isEqualTo(result); - } - } - - @Nested - class Problem4Test { - @Test - void case1() { - String word = "I love you"; - String result = "R olev blf"; - assertThat(Problem4.solution(word)).isEqualTo(result); - } - } - - @Nested - class Problem5Test { - @Test - void case1() { - int money = 50_237; - List result = List.of(1, 0, 0, 0, 0, 2, 0, 3, 7); - assertThat(Problem5.solution(money)).isEqualTo(result); - } - - @Test - void case2() { - int money = 15_000; - List result = List.of(0, 1, 1, 0, 0, 0, 0, 0, 0); - assertThat(Problem5.solution(money)).isEqualTo(result); - } - } - - @Nested - class Problem6Test { - @Test - void case1() { - List> forms = List.of( - List.of("jm@email.com", "제이엠"), - List.of("jason@email.com", "제이슨"), - List.of("woniee@email.com", "워니"), - List.of("mj@email.com", "엠제이"), - List.of("nowm@email.com", "이제엠") - ); - List result = List.of("jason@email.com", "jm@email.com", "mj@email.com"); - assertThat(Problem6.solution(forms)).isEqualTo(result); - } - } - - @Nested - class Problem7Test { - @Test - void case1() { - String user = "mrko"; - List> friends = List.of( - List.of("donut", "andole"), - List.of("donut", "jun"), - List.of("donut", "mrko"), - List.of("shakevan", "andole"), - List.of("shakevan", "jun"), - List.of("shakevan", "mrko") - ); - List visitors = List.of("bedi", "bedi", "donut", "bedi", "shakevan"); - List result = List.of("andole", "jun", "bedi"); - assertThat(Problem7.solution(user, friends, visitors)).isEqualTo(result); - } - } +// @Nested +// class Problem2Test { +// @Test +// void case1() { +// String cryptogram = "browoanoommnaon"; +// String result = "brown"; +// assertThat(Problem2.solution(cryptogram)).isEqualTo(result); +// } +// +// @Test +// void case2() { +// String cryptogram = "zyelleyz"; +// String result = ""; +// assertThat(Problem2.solution(cryptogram)).isEqualTo(result); +// } +// } +// +// @Nested +// class Problem3Test { +// @Test +// void case1() { +// int number = 13; +// int result = 4; +// assertThat(Problem3.solution(number)).isEqualTo(result); +// } +// +// @Test +// void case2() { +// int number = 33; +// int result = 14; +// assertThat(Problem3.solution(number)).isEqualTo(result); +// } +// } +// +// @Nested +// class Problem4Test { +// @Test +// void case1() { +// String word = "I love you"; +// String result = "R olev blf"; +// assertThat(Problem4.solution(word)).isEqualTo(result); +// } +// } +// +// @Nested +// class Problem5Test { +// @Test +// void case1() { +// int money = 50_237; +// List result = List.of(1, 0, 0, 0, 0, 2, 0, 3, 7); +// assertThat(Problem5.solution(money)).isEqualTo(result); +// } +// +// @Test +// void case2() { +// int money = 15_000; +// List result = List.of(0, 1, 1, 0, 0, 0, 0, 0, 0); +// assertThat(Problem5.solution(money)).isEqualTo(result); +// } +// } +// +// @Nested +// class Problem6Test { +// @Test +// void case1() { +// List> forms = List.of( +// List.of("jm@email.com", "제이엠"), +// List.of("jason@email.com", "제이슨"), +// List.of("woniee@email.com", "워니"), +// List.of("mj@email.com", "엠제이"), +// List.of("nowm@email.com", "이제엠") +// ); +// List result = List.of("jason@email.com", "jm@email.com", "mj@email.com"); +// assertThat(Problem6.solution(forms)).isEqualTo(result); +// } +// } +// +// @Nested +// class Problem7Test { +// @Test +// void case1() { +// String user = "mrko"; +// List> friends = List.of( +// List.of("donut", "andole"), +// List.of("donut", "jun"), +// List.of("donut", "mrko"), +// List.of("shakevan", "andole"), +// List.of("shakevan", "jun"), +// List.of("shakevan", "mrko") +// ); +// List visitors = List.of("bedi", "bedi", "donut", "bedi", "shakevan"); +// List result = List.of("andole", "jun", "bedi"); +// assertThat(Problem7.solution(user, friends, visitors)).isEqualTo(result); +// } +// } } From e3d672d42285f741f91e5319632ededf8d4968c3 Mon Sep 17 00:00:00 2001 From: yangyanghyunjung Date: Tue, 17 Oct 2023 09:45:46 +0900 Subject: [PATCH 18/37] yangyanghunjung branch test --- src/main/java/onboarding/Problem1.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/onboarding/Problem1.java b/src/main/java/onboarding/Problem1.java index b99e6b5e67..480c094bc9 100644 --- a/src/main/java/onboarding/Problem1.java +++ b/src/main/java/onboarding/Problem1.java @@ -5,6 +5,7 @@ class Problem1 { public static int solution(List pobi, List crong) { int answer = Integer.MAX_VALUE; + //test return answer; } } \ No newline at end of file From 672b92cdf565b1ca02c5d8fec7902d42ea75fc32 Mon Sep 17 00:00:00 2001 From: yangyanghyunjung Date: Tue, 17 Oct 2023 09:47:17 +0900 Subject: [PATCH 19/37] yangyanghunjung branch test2 --- src/main/java/onboarding/Problem1.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/onboarding/Problem1.java b/src/main/java/onboarding/Problem1.java index 480c094bc9..00651bfd5c 100644 --- a/src/main/java/onboarding/Problem1.java +++ b/src/main/java/onboarding/Problem1.java @@ -6,6 +6,7 @@ class Problem1 { public static int solution(List pobi, List crong) { int answer = Integer.MAX_VALUE; //test + //teset2 return answer; } } \ No newline at end of file From 4ef00082c1b3dc9e4ba3f80bb6bdabcdc320b155 Mon Sep 17 00:00:00 2001 From: yang Date: Fri, 13 Oct 2023 09:43:22 +0900 Subject: [PATCH 20/37] =?UTF-8?q?=EC=BB=A4=EB=B0=8B=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Test/README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Test/README.md b/Test/README.md index adcb7763a0..a555ac76b8 100644 --- a/Test/README.md +++ b/Test/README.md @@ -1,2 +1,4 @@ -

Hello World

-
this is test to checkout branchgit
\ No newline at end of file +# Git 연결 확인 test2 +- - - +- hellogut +- hi \ No newline at end of file From 8d804b27509030a20bb91a9e82af3214e19607e6 Mon Sep 17 00:00:00 2001 From: yangyanghyunjung Date: Thu, 12 Oct 2023 22:15:04 +0900 Subject: [PATCH 21/37] =?UTF-8?q?=EA=B3=BC=EC=97=B0=20=EC=84=B1=EA=B3=B5?= =?UTF-8?q?=3F=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Test/README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Test/README.md b/Test/README.md index a555ac76b8..adcb7763a0 100644 --- a/Test/README.md +++ b/Test/README.md @@ -1,4 +1,2 @@ -# Git 연결 확인 test2 -- - - -- hellogut -- hi \ No newline at end of file +

Hello World

+
this is test to checkout branchgit
\ No newline at end of file From dc26ea0a412d7caec151ac4a1d4984a9161f2f4f Mon Sep 17 00:00:00 2001 From: yang Date: Fri, 13 Oct 2023 09:43:22 +0900 Subject: [PATCH 22/37] =?UTF-8?q?=EC=BB=A4=EB=B0=8B=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Test/README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Test/README.md b/Test/README.md index adcb7763a0..a555ac76b8 100644 --- a/Test/README.md +++ b/Test/README.md @@ -1,2 +1,4 @@ -

Hello World

-
this is test to checkout branchgit
\ No newline at end of file +# Git 연결 확인 test2 +- - - +- hellogut +- hi \ No newline at end of file From b980c5522d89fb530cb42b6d0bbf56e8c32c89a6 Mon Sep 17 00:00:00 2001 From: yang Date: Fri, 13 Oct 2023 09:54:12 +0900 Subject: [PATCH 23/37] =?UTF-8?q?Revert=20"=EC=BB=A4=EB=B0=8B=EC=BB=A4?= =?UTF-8?q?=EB=B0=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit afdb9b7f1deb9594739d3e8d9a547140a502f708. --- Test/README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Test/README.md b/Test/README.md index a555ac76b8..7d5a96a066 100644 --- a/Test/README.md +++ b/Test/README.md @@ -1,4 +1,3 @@ -# Git 연결 확인 test2 -- - - -- hellogut -- hi \ No newline at end of file +# Git 연결 확인 test +--- +:raised_hand: \ No newline at end of file From 64ab12d5b73fb102a3942e361b0598718cdec6dd Mon Sep 17 00:00:00 2001 From: yang Date: Fri, 13 Oct 2023 09:55:21 +0900 Subject: [PATCH 24/37] =?UTF-8?q?com=20=EC=BB=A4=EB=B0=8B=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Test/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Test/README.md b/Test/README.md index 7d5a96a066..2c361a35fd 100644 --- a/Test/README.md +++ b/Test/README.md @@ -1,3 +1,4 @@ # Git 연결 확인 test --- -:raised_hand: \ No newline at end of file +:raised_hand: +- 안녕 \ No newline at end of file From 59d03517e7114fbd78cad063a4e23f5ba4b02518 Mon Sep 17 00:00:00 2001 From: yang Date: Fri, 13 Oct 2023 15:22:20 +0900 Subject: [PATCH 25/37] =?UTF-8?q?onbarding=5Fproblem1=20=EC=99=84=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/hi/Compare.java | 12 ++ src/main/java/hi/Page.java | 28 +++ src/main/java/hi/Score.java | 40 ++++ src/main/java/onboarding/Problem1.java | 9 +- src/test/java/onboarding/ApplicationTest.java | 192 +++++++++--------- 5 files changed, 185 insertions(+), 96 deletions(-) create mode 100644 src/main/java/hi/Compare.java create mode 100644 src/main/java/hi/Page.java create mode 100644 src/main/java/hi/Score.java diff --git a/src/main/java/hi/Compare.java b/src/main/java/hi/Compare.java new file mode 100644 index 0000000000..1fd7f31165 --- /dev/null +++ b/src/main/java/hi/Compare.java @@ -0,0 +1,12 @@ +package hi; + +public class Compare { + public int CompareScore(Integer largePobiScore ,Integer largeCrongScore) { + if (largePobiScore < largeCrongScore) { + return 2; + } else if (largePobiScore > largeCrongScore) { + return 1; + } + return 0; + } +} diff --git a/src/main/java/hi/Page.java b/src/main/java/hi/Page.java new file mode 100644 index 0000000000..129d0e4616 --- /dev/null +++ b/src/main/java/hi/Page.java @@ -0,0 +1,28 @@ +package hi; + +import java.util.List; +import hi.Score; + +public class Page { + private static final int MIN = 3; + private static final int MAX =398; + + public int PageValidation (List pobi, List crong) { + int pobiLeft = pobi.get(0); + int pobiRight = pobi.get(1); + int crongLeft = crong.get(0); + int crongRight = crong.get(1); + + if (pobiRight - pobiLeft != 1 || crongRight - crongLeft != 1) { + return -1; + } + if (pobiLeft < MIN || pobiLeft > MAX || crongLeft < MIN || crongLeft > MAX + || pobiRight < MIN || pobiRight > MAX || crongRight < MIN || crongRight > MAX) { + return -1; + } + Score score = new Score(); + int win = score.LargeScore(pobiLeft, pobiRight, crongLeft, crongRight); + + return win; + } +} \ No newline at end of file diff --git a/src/main/java/hi/Score.java b/src/main/java/hi/Score.java new file mode 100644 index 0000000000..ef5c28cfbc --- /dev/null +++ b/src/main/java/hi/Score.java @@ -0,0 +1,40 @@ +package hi; + +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; + +public class Score { + public Integer LargeScore(Integer pobiLeft, Integer pobiRight, Integer crongLeft, Integer crongRight) { + + int largePobiScoreLeft = Calculate(pobiLeft); + int largePobiScoreRight = Calculate(pobiRight); + int largeCrongScoreLeft = Calculate(crongLeft); + int largeCrongScoreRight = Calculate(crongRight); + + int largePobiScore = largePobiScoreLeft < largePobiScoreRight ? largePobiScoreRight : largePobiScoreLeft; + int largeCrongScore = largeCrongScoreLeft < largeCrongScoreRight ? largeCrongScoreRight : largeCrongScoreLeft; + + Compare compare = new Compare(); + int win = compare.CompareScore(largePobiScore, largeCrongScore); + + return win; + } + public int Calculate (int score) { + LinkedList scoreLists = new LinkedList<>(); + while (score > 0) { + scoreLists.push(score % 10); + score /= 10; + } + int add = 0; + int mul = 1; + for (int i = 0; i < scoreLists.size(); i++) { + add += scoreLists.get(i); + mul *= scoreLists.get(i); + } + + return add < mul ? mul : add; + } +} + + diff --git a/src/main/java/onboarding/Problem1.java b/src/main/java/onboarding/Problem1.java index 00651bfd5c..b4deee9f4f 100644 --- a/src/main/java/onboarding/Problem1.java +++ b/src/main/java/onboarding/Problem1.java @@ -1,12 +1,13 @@ package onboarding; import java.util.List; +import hi.Page; class Problem1 { public static int solution(List pobi, List crong) { - int answer = Integer.MAX_VALUE; - //test - //teset2 - return answer; + Page page = new Page(); + int score = page.PageValidation(pobi, crong); + System.out.println(score); + return score; } } \ No newline at end of file diff --git a/src/test/java/onboarding/ApplicationTest.java b/src/test/java/onboarding/ApplicationTest.java index 4cdf3ed0ef..0e8a82599f 100644 --- a/src/test/java/onboarding/ApplicationTest.java +++ b/src/test/java/onboarding/ApplicationTest.java @@ -33,101 +33,109 @@ void case3() { int result = -1; assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); } - } - - @Nested - class Problem2Test { - @Test - void case1() { - String cryptogram = "browoanoommnaon"; - String result = "brown"; - assertThat(Problem2.solution(cryptogram)).isEqualTo(result); - } - - @Test - void case2() { - String cryptogram = "zyelleyz"; - String result = ""; - assertThat(Problem2.solution(cryptogram)).isEqualTo(result); - } - } - - @Nested - class Problem3Test { - @Test - void case1() { - int number = 13; - int result = 4; - assertThat(Problem3.solution(number)).isEqualTo(result); - } - - @Test - void case2() { - int number = 33; - int result = 14; - assertThat(Problem3.solution(number)).isEqualTo(result); - } - } - - @Nested - class Problem4Test { - @Test - void case1() { - String word = "I love you"; - String result = "R olev blf"; - assertThat(Problem4.solution(word)).isEqualTo(result); - } - } - - @Nested - class Problem5Test { - @Test - void case1() { - int money = 50_237; - List result = List.of(1, 0, 0, 0, 0, 2, 0, 3, 7); - assertThat(Problem5.solution(money)).isEqualTo(result); - } @Test - void case2() { - int money = 15_000; - List result = List.of(0, 1, 1, 0, 0, 0, 0, 0, 0); - assertThat(Problem5.solution(money)).isEqualTo(result); - } - } - - @Nested - class Problem6Test { - @Test - void case1() { - List> forms = List.of( - List.of("jm@email.com", "제이엠"), - List.of("jason@email.com", "제이슨"), - List.of("woniee@email.com", "워니"), - List.of("mj@email.com", "엠제이"), - List.of("nowm@email.com", "이제엠") - ); - List result = List.of("jason@email.com", "jm@email.com", "mj@email.com"); - assertThat(Problem6.solution(forms)).isEqualTo(result); + void case4() { + List pobi = List.of(1,2); + List crong = List.of(399,400); + int result = -1; + assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); } } - @Nested - class Problem7Test { - @Test - void case1() { - String user = "mrko"; - List> friends = List.of( - List.of("donut", "andole"), - List.of("donut", "jun"), - List.of("donut", "mrko"), - List.of("shakevan", "andole"), - List.of("shakevan", "jun"), - List.of("shakevan", "mrko") - ); - List visitors = List.of("bedi", "bedi", "donut", "bedi", "shakevan"); - List result = List.of("andole", "jun", "bedi"); - assertThat(Problem7.solution(user, friends, visitors)).isEqualTo(result); - } - } +// @Nested +// class Problem2Test { +// @Test +// void case1() { +// String cryptogram = "browoanoommnaon"; +// String result = "brown"; +// assertThat(Problem2.solution(cryptogram)).isEqualTo(result); +// } +// +// @Test +// void case2() { +// String cryptogram = "zyelleyz"; +// String result = ""; +// assertThat(Problem2.solution(cryptogram)).isEqualTo(result); +// } +// } +// +// @Nested +// class Problem3Test { +// @Test +// void case1() { +// int number = 13; +// int result = 4; +// assertThat(Problem3.solution(number)).isEqualTo(result); +// } +// +// @Test +// void case2() { +// int number = 33; +// int result = 14; +// assertThat(Problem3.solution(number)).isEqualTo(result); +// } +// } +// +// @Nested +// class Problem4Test { +// @Test +// void case1() { +// String word = "I love you"; +// String result = "R olev blf"; +// assertThat(Problem4.solution(word)).isEqualTo(result); +// } +// } +// +// @Nested +// class Problem5Test { +// @Test +// void case1() { +// int money = 50_237; +// List result = List.of(1, 0, 0, 0, 0, 2, 0, 3, 7); +// assertThat(Problem5.solution(money)).isEqualTo(result); +// } +// +// @Test +// void case2() { +// int money = 15_000; +// List result = List.of(0, 1, 1, 0, 0, 0, 0, 0, 0); +// assertThat(Problem5.solution(money)).isEqualTo(result); +// } +// } +// +// @Nested +// class Problem6Test { +// @Test +// void case1() { +// List> forms = List.of( +// List.of("jm@email.com", "제이엠"), +// List.of("jason@email.com", "제이슨"), +// List.of("woniee@email.com", "워니"), +// List.of("mj@email.com", "엠제이"), +// List.of("nowm@email.com", "이제엠") +// ); +// List result = List.of("jason@email.com", "jm@email.com", "mj@email.com"); +// assertThat(Problem6.solution(forms)).isEqualTo(result); +// } +// } +// +// @Nested +// class Problem7Test { +// @Test +// void case1() { +// String user = "mrko"; +// List> friends = List.of( +// List.of("donut", "andole"), +// List.of("donut", "jun"), +// List.of("donut", "mrko"), +// List.of("shakevan", "andole"), +// List.of("shakevan", "jun"), +// List.of("shakevan", "mrko") +// ); +// List visitors = List.of("bedi", "bedi", "donut", "bedi", "shakevan"); +// List result = List.of("andole", "jun", "bedi"); +// assertThat(Problem7.solution(user, friends, visitors)).isEqualTo(result); +// } +// } } From af99c0fa7cd3baf67c22e34c46a2a6e6bb7ccdde Mon Sep 17 00:00:00 2001 From: yang Date: Mon, 16 Oct 2023 10:36:23 +0900 Subject: [PATCH 26/37] =?UTF-8?q?=EA=B8=B0=EB=8A=A5=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Problem2/functionList.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/main/java/Problem2/functionList.md diff --git a/src/main/java/Problem2/functionList.md b/src/main/java/Problem2/functionList.md new file mode 100644 index 0000000000..6d5f33a535 --- /dev/null +++ b/src/main/java/Problem2/functionList.md @@ -0,0 +1,16 @@ +# 🚀 problem2 기능 목록 +- - - +### 1. StringValidation +```java +System.out.println("예외"); +``` +- 글자수가 **1**이하 **1000** 이상일 경우 +- **대문자**가 들어올 경우 +- 빈문자열 값: ```return 빈문자열``` +- - - +### 2. FindAndRemoveDuplicate +- **LinkedList**로 첫 문자부터 순회 +- 반복문자 나올 시 next node **포인터 변경** (삭제) +- 반복이 없다면 다음 node로 이동 +- ```return 최종 문자열``` + \ No newline at end of file From 0b975384d31f5a92ddc9ef793d8706c790ec2fa8 Mon Sep 17 00:00:00 2001 From: yang Date: Mon, 16 Oct 2023 10:53:04 +0900 Subject: [PATCH 27/37] =?UTF-8?q?StringValidation=20=EA=B8=B0=EB=8A=A5=20c?= =?UTF-8?q?ommit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Problem2/StringValidation.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/main/java/Problem2/StringValidation.java diff --git a/src/main/java/Problem2/StringValidation.java b/src/main/java/Problem2/StringValidation.java new file mode 100644 index 0000000000..1e4e965312 --- /dev/null +++ b/src/main/java/Problem2/StringValidation.java @@ -0,0 +1,18 @@ +package Problem2; + +public class StringValidation { + public boolean Validate (String cryptogram) { + // 문자열 길이 오류 + if (cryptogram.length() < 1 || cryptogram.length() > 1000) { + return false; + } + // 대문자 포함될 경우 + char[] charArray = cryptogram.toCharArray(); + for (int i = 0; i < charArray.length; i++) { + if (Character.isUpperCase(charArray[i])) { + return false; + } + } + return true; + } +} From c3f12c79e5611f2bb5e5c29a30840860962fd040 Mon Sep 17 00:00:00 2001 From: yang Date: Mon, 16 Oct 2023 10:54:34 +0900 Subject: [PATCH 28/37] =?UTF-8?q?FindAndRemoveDuplicate=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=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/Problem2/FindAndRemoveDuplicate.java | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/main/java/Problem2/FindAndRemoveDuplicate.java diff --git a/src/main/java/Problem2/FindAndRemoveDuplicate.java b/src/main/java/Problem2/FindAndRemoveDuplicate.java new file mode 100644 index 0000000000..b20b73ae29 --- /dev/null +++ b/src/main/java/Problem2/FindAndRemoveDuplicate.java @@ -0,0 +1,9 @@ +package Problem2; + +public class FindAndRemoveDuplicate { + public String FindAndRemve (String cryptogram) + { + + return ""; + } +} From 6f83d185f78edb9708f12bae296214d457b116f3 Mon Sep 17 00:00:00 2001 From: yang Date: Mon, 16 Oct 2023 16:49:13 +0900 Subject: [PATCH 29/37] =?UTF-8?q?FindAndRemoveDuplicate=20=EC=A4=91?= =?UTF-8?q?=EB=B3=B5=EA=B0=92=20=EC=82=AD=EC=A0=9C=20=EA=B8=B0=EB=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/Problem2/FindAndRemoveDuplicate.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/Problem2/FindAndRemoveDuplicate.java b/src/main/java/Problem2/FindAndRemoveDuplicate.java index b20b73ae29..cb62f64ca0 100644 --- a/src/main/java/Problem2/FindAndRemoveDuplicate.java +++ b/src/main/java/Problem2/FindAndRemoveDuplicate.java @@ -1,9 +1,20 @@ package Problem2; +import java.util.ArrayList; +import java.util.Arrays; public class FindAndRemoveDuplicate { public String FindAndRemve (String cryptogram) { - - return ""; + String[] cryptogramArray = cryptogram.split(""); + ArrayList cryptogramList = new ArrayList(Arrays.asList(cryptogramArray)); + for (int i = 0; i Date: Mon, 16 Oct 2023 16:50:55 +0900 Subject: [PATCH 30/37] =?UTF-8?q?=EC=BD=94=EB=93=9C=EB=A6=AC=EB=B7=B0=202j?= =?UTF-8?q?un0's=20=EC=A4=91=EB=B3=B5=EA=B0=92=20=EC=A0=9C=EA=B1=B0=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Problem2/eJun0SSockSSock.java | 35 +++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/main/java/Problem2/eJun0SSockSSock.java diff --git a/src/main/java/Problem2/eJun0SSockSSock.java b/src/main/java/Problem2/eJun0SSockSSock.java new file mode 100644 index 0000000000..97c1041580 --- /dev/null +++ b/src/main/java/Problem2/eJun0SSockSSock.java @@ -0,0 +1,35 @@ +package Problem2; + +import java.util.Stack; + +public class eJun0SSockSSock { + // 2jun0's Code + // 1. Stack 생성 + // 2. for문 순회 + // 3. push || pop + + public String ConvertStackToString(Stack stack) { + StringBuilder sb = new StringBuilder(); + // 후입선출 고려 0번째 index에 add가 아닌 insert 해줌. + while (!stack.isEmpty()) { //모두 pop() 되면 종료 + // pop()은 제거하면서 sb에 insert도 가능한가봄 + sb.insert(0,stack.pop()); + } + return sb.toString(); + } + public String RemoveDuplicate(String cryptogram) { + Stack stack = new Stack(); + + for (char c: cryptogram.toCharArray()) { + // 나는 문자열 비교시 equals ( 참조형 비교 위해) 썼는데 char은 기본형이라 == 시용 가능 + if (stack.size() > 0 && stack.peek().equals(c)) { + stack.pop(); + } else { + stack.push(c); + } + } + return ConvertStackToString(stack); + } + + +} From 4bac3b8b195c43577fd76204500428d0c232f4e9 Mon Sep 17 00:00:00 2001 From: yang Date: Mon, 16 Oct 2023 16:51:20 +0900 Subject: [PATCH 31/37] =?UTF-8?q?Test=20code=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/onboarding/ApplicationTest.java | 89 ++++++++++--------- 1 file changed, 48 insertions(+), 41 deletions(-) diff --git a/src/test/java/onboarding/ApplicationTest.java b/src/test/java/onboarding/ApplicationTest.java index 0e8a82599f..976c44b560 100644 --- a/src/test/java/onboarding/ApplicationTest.java +++ b/src/test/java/onboarding/ApplicationTest.java @@ -8,58 +8,65 @@ import static org.assertj.core.api.Assertions.assertThat; class ApplicationTest { +// @Nested +// class Problem1Test { +// @Test +// void case1() { +// List pobi = List.of(97, 98); +// List crong = List.of(197, 198); +// int result = 0; +// assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); +// } +// +// @Test +// void case2() { +// List pobi = List.of(131, 132); +// List crong = List.of(211, 212); +// int result = 1; +// assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); +// } +// +// @Test +// void case3() { +// List pobi = List.of(99, 102); +// List crong = List.of(211, 212); +// int result = -1; +// assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); +// } +// +// @Test +// void case4() { +// List pobi = List.of(1,2); +// List crong = List.of(399,400); +// int result = -1; +// assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); +// } +// } + @Nested - class Problem1Test { + class Problem2Test { @Test void case1() { - List pobi = List.of(97, 98); - List crong = List.of(197, 198); - int result = 0; - assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); + String cryptogram = "browoanoommnaon"; + String result = "brown"; + assertThat(Problem2.solution(cryptogram)).isEqualTo(result); } @Test void case2() { - List pobi = List.of(131, 132); - List crong = List.of(211, 212); - int result = 1; - assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); + String cryptogram = "zyelleyz"; + String result = ""; + assertThat(Problem2.solution(cryptogram)).isEqualTo(result); } @Test void case3() { - List pobi = List.of(99, 102); - List crong = List.of(211, 212); - int result = -1; - assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); - } - - @Test - void case4() { - List pobi = List.of(1,2); - List crong = List.of(399,400); - int result = -1; - assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); + String cryptogram = ""; + String result = ""; + assertThat(Problem2.solution(cryptogram)).isEqualTo(result); } } -// @Nested -// class Problem2Test { -// @Test -// void case1() { -// String cryptogram = "browoanoommnaon"; -// String result = "brown"; -// assertThat(Problem2.solution(cryptogram)).isEqualTo(result); -// } -// -// @Test -// void case2() { -// String cryptogram = "zyelleyz"; -// String result = ""; -// assertThat(Problem2.solution(cryptogram)).isEqualTo(result); -// } -// } -// // @Nested // class Problem3Test { // @Test @@ -86,7 +93,7 @@ void case4() { // assertThat(Problem4.solution(word)).isEqualTo(result); // } // } -// + // @Nested // class Problem5Test { // @Test @@ -103,7 +110,7 @@ void case4() { // assertThat(Problem5.solution(money)).isEqualTo(result); // } // } -// + // @Nested // class Problem6Test { // @Test @@ -119,7 +126,7 @@ void case4() { // assertThat(Problem6.solution(forms)).isEqualTo(result); // } // } -// + // @Nested // class Problem7Test { // @Test From a53c4a33fa03d21bf7f5d6a4bb00bda397108238 Mon Sep 17 00:00:00 2001 From: yang Date: Mon, 16 Oct 2023 16:51:49 +0900 Subject: [PATCH 32/37] =?UTF-8?q?Problem2=20Main=ED=95=A8=EC=88=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/onboarding/Problem2.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/onboarding/Problem2.java b/src/main/java/onboarding/Problem2.java index ee836e9cac..6f3c5c18e1 100644 --- a/src/main/java/onboarding/Problem2.java +++ b/src/main/java/onboarding/Problem2.java @@ -1,8 +1,21 @@ package onboarding; +import Problem2.StringValidation; +import Problem2.FindAndRemoveDuplicate; +import Problem2.eJun0SSockSSock; public class Problem2 { public static String solution(String cryptogram) { - String answer = "answer"; - return answer; + // 문자열 validation check return boolean + StringValidation stringValidation = new StringValidation(); + if (!stringValidation.Validate(cryptogram)) { + return ""; + } + // validation check 값이 true면 중복 삭제 +// FindAndRemoveDuplicate FRD = new FindAndRemoveDuplicate(); +// String result = FRD.FindAndRemve(cryptogram); + //2jun0's + eJun0SSockSSock ejun0 = new eJun0SSockSSock(); + String result = ejun0.RemoveDuplicate(cryptogram); + return result; } } From 047a7b80a59d34356a8c4c671c9f3ef40d37f096 Mon Sep 17 00:00:00 2001 From: yangyanghyunjung Date: Tue, 17 Oct 2023 08:43:39 +0900 Subject: [PATCH 33/37] =?UTF-8?q?=EC=B6=A9=EB=8F=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/onboarding/ApplicationTest.java | 225 +++++++++--------- 1 file changed, 109 insertions(+), 116 deletions(-) diff --git a/src/test/java/onboarding/ApplicationTest.java b/src/test/java/onboarding/ApplicationTest.java index 976c44b560..a871e58a95 100644 --- a/src/test/java/onboarding/ApplicationTest.java +++ b/src/test/java/onboarding/ApplicationTest.java @@ -8,40 +8,40 @@ import static org.assertj.core.api.Assertions.assertThat; class ApplicationTest { -// @Nested -// class Problem1Test { -// @Test -// void case1() { -// List pobi = List.of(97, 98); -// List crong = List.of(197, 198); -// int result = 0; -// assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); -// } -// -// @Test -// void case2() { -// List pobi = List.of(131, 132); -// List crong = List.of(211, 212); -// int result = 1; -// assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); -// } -// -// @Test -// void case3() { -// List pobi = List.of(99, 102); -// List crong = List.of(211, 212); -// int result = -1; -// assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); -// } -// -// @Test -// void case4() { -// List pobi = List.of(1,2); -// List crong = List.of(399,400); -// int result = -1; -// assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); -// } -// } + @Nested + class Problem1Test { + @Test + void case1() { + List pobi = List.of(97, 98); + List crong = List.of(197, 198); + int result = 0; + assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); + } + + @Test + void case2() { + List pobi = List.of(131, 132); + List crong = List.of(211, 212); + int result = 1; + assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); + } + + @Test + void case3() { + List pobi = List.of(99, 102); + List crong = List.of(211, 212); + int result = -1; + assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); + } + + @Test + void case4() { + List pobi = List.of(1,2); + List crong = List.of(399,400); + int result = -1; + assertThat(Problem1.solution(pobi, crong)).isEqualTo(result); + } + } @Nested class Problem2Test { @@ -58,91 +58,84 @@ void case2() { String result = ""; assertThat(Problem2.solution(cryptogram)).isEqualTo(result); } + } + @Nested + class Problem3Test { @Test - void case3() { - String cryptogram = ""; - String result = ""; - assertThat(Problem2.solution(cryptogram)).isEqualTo(result); + void case1() { + int number = 13; + int result = 4; + assertThat(Problem3.solution(number)).isEqualTo(result); + } + + @Test + void case2() { + int number = 33; + int result = 14; + assertThat(Problem3.solution(number)).isEqualTo(result); } } -// @Nested -// class Problem3Test { -// @Test -// void case1() { -// int number = 13; -// int result = 4; -// assertThat(Problem3.solution(number)).isEqualTo(result); -// } -// -// @Test -// void case2() { -// int number = 33; -// int result = 14; -// assertThat(Problem3.solution(number)).isEqualTo(result); -// } -// } -// -// @Nested -// class Problem4Test { -// @Test -// void case1() { -// String word = "I love you"; -// String result = "R olev blf"; -// assertThat(Problem4.solution(word)).isEqualTo(result); -// } -// } - -// @Nested -// class Problem5Test { -// @Test -// void case1() { -// int money = 50_237; -// List result = List.of(1, 0, 0, 0, 0, 2, 0, 3, 7); -// assertThat(Problem5.solution(money)).isEqualTo(result); -// } -// -// @Test -// void case2() { -// int money = 15_000; -// List result = List.of(0, 1, 1, 0, 0, 0, 0, 0, 0); -// assertThat(Problem5.solution(money)).isEqualTo(result); -// } -// } - -// @Nested -// class Problem6Test { -// @Test -// void case1() { -// List> forms = List.of( -// List.of("jm@email.com", "제이엠"), -// List.of("jason@email.com", "제이슨"), -// List.of("woniee@email.com", "워니"), -// List.of("mj@email.com", "엠제이"), -// List.of("nowm@email.com", "이제엠") -// ); -// List result = List.of("jason@email.com", "jm@email.com", "mj@email.com"); -// assertThat(Problem6.solution(forms)).isEqualTo(result); -// } -// } - -// @Nested -// class Problem7Test { -// @Test -// void case1() { -// String user = "mrko"; -// List> friends = List.of( -// List.of("donut", "andole"), -// List.of("donut", "jun"), -// List.of("donut", "mrko"), -// List.of("shakevan", "andole"), -// List.of("shakevan", "jun"), -// List.of("shakevan", "mrko") -// ); -// List visitors = List.of("bedi", "bedi", "donut", "bedi", "shakevan"); -// List result = List.of("andole", "jun", "bedi"); -// assertThat(Problem7.solution(user, friends, visitors)).isEqualTo(result); -// } -// } + @Nested + class Problem4Test { + @Test + void case1() { + String word = "I love you"; + String result = "R olev blf"; + assertThat(Problem4.solution(word)).isEqualTo(result); + } + } + + @Nested + class Problem5Test { + @Test + void case1() { + int money = 50_237; + List result = List.of(1, 0, 0, 0, 0, 2, 0, 3, 7); + assertThat(Problem5.solution(money)).isEqualTo(result); + } + + @Test + void case2() { + int money = 15_000; + List result = List.of(0, 1, 1, 0, 0, 0, 0, 0, 0); + assertThat(Problem5.solution(money)).isEqualTo(result); + } + } + + @Nested + class Problem6Test { + @Test + void case1() { + List> forms = List.of( + List.of("jm@email.com", "제이엠"), + List.of("jason@email.com", "제이슨"), + List.of("woniee@email.com", "워니"), + List.of("mj@email.com", "엠제이"), + List.of("nowm@email.com", "이제엠") + ); + List result = List.of("jason@email.com", "jm@email.com", "mj@email.com"); + assertThat(Problem6.solution(forms)).isEqualTo(result); + } + } + + @Nested + class Problem7Test { + @Test + void case1() { + String user = "mrko"; + List> friends = List.of( + List.of("donut", "andole"), + List.of("donut", "jun"), + List.of("donut", "mrko"), + List.of("shakevan", "andole"), + List.of("shakevan", "jun"), + List.of("shakevan", "mrko") + ); + List visitors = List.of("bedi", "bedi", "donut", "bedi", "shakevan"); + List result = List.of("andole", "jun", "bedi"); + assertThat(Problem7.solution(user, friends, visitors)).isEqualTo(result); + } + } } From eca9aabb7f0990c8e12b44653df4f8b01a500ba7 Mon Sep 17 00:00:00 2001 From: yangyanghyunjung Date: Tue, 17 Oct 2023 08:54:01 +0900 Subject: [PATCH 34/37] =?UTF-8?q?FindAndRemoveDuplicate=20=EC=B6=A9?= =?UTF-8?q?=EB=8F=8C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Problem2/FindAndRemoveDuplicate.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/Problem2/FindAndRemoveDuplicate.java b/src/main/java/Problem2/FindAndRemoveDuplicate.java index cb62f64ca0..8bd259b4d9 100644 --- a/src/main/java/Problem2/FindAndRemoveDuplicate.java +++ b/src/main/java/Problem2/FindAndRemoveDuplicate.java @@ -1,12 +1,11 @@ package Problem2; import java.util.ArrayList; import java.util.Arrays; - public class FindAndRemoveDuplicate { public String FindAndRemve (String cryptogram) { String[] cryptogramArray = cryptogram.split(""); - ArrayList cryptogramList = new ArrayList(Arrays.asList(cryptogramArray)); + ArrayList cryptogramList = new ArrayList<>(Arrays.asList(cryptogramArray)); for (int i = 0; i Date: Tue, 17 Oct 2023 08:57:24 +0900 Subject: [PATCH 35/37] =?UTF-8?q?FindAndRemoveDuplicate=20=EC=B6=A9?= =?UTF-8?q?=EB=8F=8C=20=ED=95=B4=EA=B2=B02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Problem2/FindAndRemoveDuplicate.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/Problem2/FindAndRemoveDuplicate.java b/src/main/java/Problem2/FindAndRemoveDuplicate.java index 8bd259b4d9..cb62f64ca0 100644 --- a/src/main/java/Problem2/FindAndRemoveDuplicate.java +++ b/src/main/java/Problem2/FindAndRemoveDuplicate.java @@ -1,11 +1,12 @@ package Problem2; import java.util.ArrayList; import java.util.Arrays; + public class FindAndRemoveDuplicate { public String FindAndRemve (String cryptogram) { String[] cryptogramArray = cryptogram.split(""); - ArrayList cryptogramList = new ArrayList<>(Arrays.asList(cryptogramArray)); + ArrayList cryptogramList = new ArrayList(Arrays.asList(cryptogramArray)); for (int i = 0; i Date: Tue, 17 Oct 2023 08:59:59 +0900 Subject: [PATCH 36/37] =?UTF-8?q?Test=EC=BD=94=EB=93=9C=20=EC=B6=A9?= =?UTF-8?q?=EB=8F=8C=20=ED=95=B4=EA=B2=B02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/onboarding/ApplicationTest.java | 190 +++++++++--------- 1 file changed, 95 insertions(+), 95 deletions(-) diff --git a/src/test/java/onboarding/ApplicationTest.java b/src/test/java/onboarding/ApplicationTest.java index a871e58a95..0e8a82599f 100644 --- a/src/test/java/onboarding/ApplicationTest.java +++ b/src/test/java/onboarding/ApplicationTest.java @@ -43,99 +43,99 @@ void case4() { } } - @Nested - class Problem2Test { - @Test - void case1() { - String cryptogram = "browoanoommnaon"; - String result = "brown"; - assertThat(Problem2.solution(cryptogram)).isEqualTo(result); - } - - @Test - void case2() { - String cryptogram = "zyelleyz"; - String result = ""; - assertThat(Problem2.solution(cryptogram)).isEqualTo(result); - } - } - - @Nested - class Problem3Test { - @Test - void case1() { - int number = 13; - int result = 4; - assertThat(Problem3.solution(number)).isEqualTo(result); - } - - @Test - void case2() { - int number = 33; - int result = 14; - assertThat(Problem3.solution(number)).isEqualTo(result); - } - } - - @Nested - class Problem4Test { - @Test - void case1() { - String word = "I love you"; - String result = "R olev blf"; - assertThat(Problem4.solution(word)).isEqualTo(result); - } - } - - @Nested - class Problem5Test { - @Test - void case1() { - int money = 50_237; - List result = List.of(1, 0, 0, 0, 0, 2, 0, 3, 7); - assertThat(Problem5.solution(money)).isEqualTo(result); - } - - @Test - void case2() { - int money = 15_000; - List result = List.of(0, 1, 1, 0, 0, 0, 0, 0, 0); - assertThat(Problem5.solution(money)).isEqualTo(result); - } - } - - @Nested - class Problem6Test { - @Test - void case1() { - List> forms = List.of( - List.of("jm@email.com", "제이엠"), - List.of("jason@email.com", "제이슨"), - List.of("woniee@email.com", "워니"), - List.of("mj@email.com", "엠제이"), - List.of("nowm@email.com", "이제엠") - ); - List result = List.of("jason@email.com", "jm@email.com", "mj@email.com"); - assertThat(Problem6.solution(forms)).isEqualTo(result); - } - } - - @Nested - class Problem7Test { - @Test - void case1() { - String user = "mrko"; - List> friends = List.of( - List.of("donut", "andole"), - List.of("donut", "jun"), - List.of("donut", "mrko"), - List.of("shakevan", "andole"), - List.of("shakevan", "jun"), - List.of("shakevan", "mrko") - ); - List visitors = List.of("bedi", "bedi", "donut", "bedi", "shakevan"); - List result = List.of("andole", "jun", "bedi"); - assertThat(Problem7.solution(user, friends, visitors)).isEqualTo(result); - } - } +// @Nested +// class Problem2Test { +// @Test +// void case1() { +// String cryptogram = "browoanoommnaon"; +// String result = "brown"; +// assertThat(Problem2.solution(cryptogram)).isEqualTo(result); +// } +// +// @Test +// void case2() { +// String cryptogram = "zyelleyz"; +// String result = ""; +// assertThat(Problem2.solution(cryptogram)).isEqualTo(result); +// } +// } +// +// @Nested +// class Problem3Test { +// @Test +// void case1() { +// int number = 13; +// int result = 4; +// assertThat(Problem3.solution(number)).isEqualTo(result); +// } +// +// @Test +// void case2() { +// int number = 33; +// int result = 14; +// assertThat(Problem3.solution(number)).isEqualTo(result); +// } +// } +// +// @Nested +// class Problem4Test { +// @Test +// void case1() { +// String word = "I love you"; +// String result = "R olev blf"; +// assertThat(Problem4.solution(word)).isEqualTo(result); +// } +// } +// +// @Nested +// class Problem5Test { +// @Test +// void case1() { +// int money = 50_237; +// List result = List.of(1, 0, 0, 0, 0, 2, 0, 3, 7); +// assertThat(Problem5.solution(money)).isEqualTo(result); +// } +// +// @Test +// void case2() { +// int money = 15_000; +// List result = List.of(0, 1, 1, 0, 0, 0, 0, 0, 0); +// assertThat(Problem5.solution(money)).isEqualTo(result); +// } +// } +// +// @Nested +// class Problem6Test { +// @Test +// void case1() { +// List> forms = List.of( +// List.of("jm@email.com", "제이엠"), +// List.of("jason@email.com", "제이슨"), +// List.of("woniee@email.com", "워니"), +// List.of("mj@email.com", "엠제이"), +// List.of("nowm@email.com", "이제엠") +// ); +// List result = List.of("jason@email.com", "jm@email.com", "mj@email.com"); +// assertThat(Problem6.solution(forms)).isEqualTo(result); +// } +// } +// +// @Nested +// class Problem7Test { +// @Test +// void case1() { +// String user = "mrko"; +// List> friends = List.of( +// List.of("donut", "andole"), +// List.of("donut", "jun"), +// List.of("donut", "mrko"), +// List.of("shakevan", "andole"), +// List.of("shakevan", "jun"), +// List.of("shakevan", "mrko") +// ); +// List visitors = List.of("bedi", "bedi", "donut", "bedi", "shakevan"); +// List result = List.of("andole", "jun", "bedi"); +// assertThat(Problem7.solution(user, friends, visitors)).isEqualTo(result); +// } +// } } From ae35432495e5b914c86388fe5262aac81b90eb6a Mon Sep 17 00:00:00 2001 From: yang Date: Fri, 13 Oct 2023 09:43:22 +0900 Subject: [PATCH 37/37] =?UTF-8?q?=EC=BB=A4=EB=B0=8B=EC=BB=A4=EB=B0=8B;;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Test/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Test/README.md b/Test/README.md index 2c361a35fd..a555ac76b8 100644 --- a/Test/README.md +++ b/Test/README.md @@ -1,4 +1,4 @@ -# Git 연결 확인 test ---- -:raised_hand: -- 안녕 \ No newline at end of file +# Git 연결 확인 test2 +- - - +- hellogut +- hi \ No newline at end of file