From 0d4fbf8ebf237a343ce6323d8195e733cbd1c0c7 Mon Sep 17 00:00:00 2001
From: YoungDong99 <114642786+YoungDong99@users.noreply.github.com>
Date: Wed, 3 May 2023 10:27:39 +0900
Subject: [PATCH 01/17] =?UTF-8?q?=EC=BB=A4=EB=B0=8B=ED=85=8C=EC=8A=A4?=
=?UTF-8?q?=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/org/example/solution1.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/example/solution1.java b/src/main/java/org/example/solution1.java
index cadc0ab..650661e 100644
--- a/src/main/java/org/example/solution1.java
+++ b/src/main/java/org/example/solution1.java
@@ -9,7 +9,7 @@ public double solution(int[] arr) {
}
answer = tot/(arr.length);
return answer;
- //커밋연습
+ //커밋테스트
}
}
From 51cc1fdcd7317c36a83c424ab7dfa2daa124ba72 Mon Sep 17 00:00:00 2001
From: YoungDong99 <114642786+YoungDong99@users.noreply.github.com>
Date: Wed, 3 May 2023 10:41:46 +0900
Subject: [PATCH 02/17] =?UTF-8?q?20230503=20=EA=B0=95=EB=8F=99=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[짝수와 홀수 구하기]
---
src/main/java/Solution/getNumber.java | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 src/main/java/Solution/getNumber.java
diff --git a/src/main/java/Solution/getNumber.java b/src/main/java/Solution/getNumber.java
new file mode 100644
index 0000000..eae1499
--- /dev/null
+++ b/src/main/java/Solution/getNumber.java
@@ -0,0 +1,11 @@
+package Solution;
+
+class Solution {
+ // 짝수일 경우 Even, 홀수일 경우 Odd 리턴.
+ public String solution(int num) {
+ String answer = "";
+ if(num % 2 == 0) answer = "Even";
+ else answer = "Odd";
+ return answer;
+ }
+}
\ No newline at end of file
From 6a9a7321bcb1b6bc3d1071a78c3cea84c02cb660 Mon Sep 17 00:00:00 2001
From: YoungDong99 <114642786+YoungDong99@users.noreply.github.com>
Date: Wed, 3 May 2023 11:27:37 +0900
Subject: [PATCH 03/17] =?UTF-8?q?[=ED=8F=89=EA=B7=A0=20=EA=B5=AC=ED=95=98?=
=?UTF-8?q?=EA=B8=B0]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/Solution/getAverage.java | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 src/main/java/Solution/getAverage.java
diff --git a/src/main/java/Solution/getAverage.java b/src/main/java/Solution/getAverage.java
new file mode 100644
index 0000000..e9223ff
--- /dev/null
+++ b/src/main/java/Solution/getAverage.java
@@ -0,0 +1,13 @@
+package Solution;
+
+class Solution {
+ public double solution(int[] arr) {
+ int n = arr.length;
+ int sum = 0;
+ for(int i = 0; i < n; i++) {
+ sum += arr[i];
+ }
+ double average = (double) sum / n;
+ return average;
+ }
+}
From 9d47cbee89d6e204b2ddd632621a294be98458f9 Mon Sep 17 00:00:00 2001
From: YoungDong99 <114642786+YoungDong99@users.noreply.github.com>
Date: Wed, 3 May 2023 11:28:59 +0900
Subject: [PATCH 04/17] =?UTF-8?q?[=ED=8F=89=EA=B7=A0=20=EA=B5=AC=ED=95=98?=
=?UTF-8?q?=EA=B8=B0]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/.name | 1 +
.idea/gradle.xml | 17 +++++++++++++++++
.idea/misc.xml | 5 +++++
.idea/vcs.xml | 6 ++++++
4 files changed, 29 insertions(+)
create mode 100644 .idea/.name
create mode 100644 .idea/gradle.xml
create mode 100644 .idea/misc.xml
create mode 100644 .idea/vcs.xml
diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..7fed7c3
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+Java-programmers
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
new file mode 100644
index 0000000..7d3b3e8
--- /dev/null
+++ b/.idea/gradle.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..25d34a4
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
From 449bb406a3b412e46b27ad1ce6c0ffb64a19a3d6 Mon Sep 17 00:00:00 2001
From: YoungDong99 <114642786+YoungDong99@users.noreply.github.com>
Date: Wed, 3 May 2023 13:12:46 +0900
Subject: [PATCH 05/17] =?UTF-8?q?[=EC=A7=9D=EC=88=98=EC=99=80=20=ED=99=80?=
=?UTF-8?q?=EC=88=98]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/org/example/solution1.java | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/example/solution1.java b/src/main/java/org/example/solution1.java
index 650661e..66d17f8 100644
--- a/src/main/java/org/example/solution1.java
+++ b/src/main/java/org/example/solution1.java
@@ -1,15 +1,12 @@
package org.example;
public class solution1 {
- public double solution(int[] arr) {
- double answer = 0;
- double tot =0;
- for(int i: arr){
- tot += i;
- }
- answer = tot/(arr.length);
+ //짝수와 홀수
+ public String solution(int num) {
+ String answer = "";
+ if(num % 2 == 0) answer = "Even";
+ else answer = "Odd";
return answer;
- //커밋테스트
}
}
From 1da8fed8573d78051d8766306a9a6da465cb99da Mon Sep 17 00:00:00 2001
From: YoungDong99 <114642786+YoungDong99@users.noreply.github.com>
Date: Wed, 3 May 2023 13:13:02 +0900
Subject: [PATCH 06/17] =?UTF-8?q?[=ED=8F=89=EA=B7=A0=20=EA=B5=AC=ED=95=98?=
=?UTF-8?q?=EA=B8=B0]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/org/example/solution2.java | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 src/main/java/org/example/solution2.java
diff --git a/src/main/java/org/example/solution2.java b/src/main/java/org/example/solution2.java
new file mode 100644
index 0000000..07d392d
--- /dev/null
+++ b/src/main/java/org/example/solution2.java
@@ -0,0 +1,14 @@
+package org.example;
+
+public class solution2 {
+ //평균 구하기
+ public double Solution(int[] arr) {
+ int n = arr.length;
+ int sum = 0;
+ for(int i = 0; i < n; i++) {
+ sum += arr[i];
+ }
+ double average = (double) sum / n;
+ return average;
+ }
+}
From ecab455ed810593fa6b35280b958f715e6a2481d Mon Sep 17 00:00:00 2001
From: YoungDong99 <114642786+YoungDong99@users.noreply.github.com>
Date: Wed, 3 May 2023 13:13:13 +0900
Subject: [PATCH 07/17] =?UTF-8?q?[=EC=9E=90=EB=A6=BF=EC=88=98=20=EB=8D=94?=
=?UTF-8?q?=ED=95=98=EA=B8=B0]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/org/example/solution3.java | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 src/main/java/org/example/solution3.java
diff --git a/src/main/java/org/example/solution3.java b/src/main/java/org/example/solution3.java
new file mode 100644
index 0000000..f2df6fd
--- /dev/null
+++ b/src/main/java/org/example/solution3.java
@@ -0,0 +1,17 @@
+package org.example;
+
+public class solution3 {
+ //자릿수 더하기
+ public int solution(int n) {
+ int answer = 0;
+ String num = String.valueOf(n);
+ for(char x : num.toCharArray()) {
+ answer += Integer.parseInt(String.valueOf(x));
+ }
+ return answer;
+ }
+ /*
+ 1. 정수 n을 문자열로 변환
+ 2. 문자열을 문자 단위로 반복하며 각 문자를 정수로 바꾸고 answer에 누적
+ */
+}
From 88e5d065b0b98f32cf39c0e1fcacaf69189c9e36 Mon Sep 17 00:00:00 2001
From: YoungDong99 <114642786+YoungDong99@users.noreply.github.com>
Date: Wed, 3 May 2023 13:13:17 +0900
Subject: [PATCH 08/17] =?UTF-8?q?[=EC=9E=90=EB=A6=BF=EC=88=98=20=EB=8D=94?=
=?UTF-8?q?=ED=95=98=EA=B8=B0]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/Solution/getAverage.java | 13 -------------
src/main/java/Solution/getNumber.java | 11 -----------
2 files changed, 24 deletions(-)
delete mode 100644 src/main/java/Solution/getAverage.java
delete mode 100644 src/main/java/Solution/getNumber.java
diff --git a/src/main/java/Solution/getAverage.java b/src/main/java/Solution/getAverage.java
deleted file mode 100644
index e9223ff..0000000
--- a/src/main/java/Solution/getAverage.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package Solution;
-
-class Solution {
- public double solution(int[] arr) {
- int n = arr.length;
- int sum = 0;
- for(int i = 0; i < n; i++) {
- sum += arr[i];
- }
- double average = (double) sum / n;
- return average;
- }
-}
diff --git a/src/main/java/Solution/getNumber.java b/src/main/java/Solution/getNumber.java
deleted file mode 100644
index eae1499..0000000
--- a/src/main/java/Solution/getNumber.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package Solution;
-
-class Solution {
- // 짝수일 경우 Even, 홀수일 경우 Odd 리턴.
- public String solution(int num) {
- String answer = "";
- if(num % 2 == 0) answer = "Even";
- else answer = "Odd";
- return answer;
- }
-}
\ No newline at end of file
From c3ab003251998c49299508365d4efde8df71c588 Mon Sep 17 00:00:00 2001
From: YoungDong99 <114642786+YoungDong99@users.noreply.github.com>
Date: Thu, 4 May 2023 14:16:48 +0900
Subject: [PATCH 09/17] =?UTF-8?q?[=EB=AC=B8=EC=9E=90=EC=97=B4=20=EB=82=B4?=
=?UTF-8?q?=20p=EC=99=80=20y=EA=B0=9C=EC=88=98=20=EA=B5=AC=ED=95=98?=
=?UTF-8?q?=EA=B8=B0]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/org/example/solution4.java | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 src/main/java/org/example/solution4.java
diff --git a/src/main/java/org/example/solution4.java b/src/main/java/org/example/solution4.java
new file mode 100644
index 0000000..97365a3
--- /dev/null
+++ b/src/main/java/org/example/solution4.java
@@ -0,0 +1,18 @@
+package org.example;
+
+public class solution4 {
+ // 문자열 내 p와 y의 개수
+ public boolean solution(String s) {
+ boolean answer = true;
+ String py = s.toLowerCase();
+ int p = 0, y = 0;
+
+ for(char x : py.toCharArray()) {
+ if(x == 'p') p++;
+ if (x == 'y') y++;
+ }
+ if(p != y) answer = false;
+
+ return answer;
+ }
+}
From cf5edf23ba9b2dcb67dbff1bf4048741059e3140 Mon Sep 17 00:00:00 2001
From: YoungDong99 <114642786+YoungDong99@users.noreply.github.com>
Date: Sun, 7 May 2023 23:43:36 +0900
Subject: [PATCH 10/17] =?UTF-8?q?[=EB=82=98=EB=A8=B8=EC=A7=80=EA=B0=80=201?=
=?UTF-8?q?=EC=9D=B4=EB=90=98=EB=8A=94=20=EC=88=98=20=EC=B0=BE=EA=B8=B0]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/org/example/solution5.java | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 src/main/java/org/example/solution5.java
diff --git a/src/main/java/org/example/solution5.java b/src/main/java/org/example/solution5.java
new file mode 100644
index 0000000..7235abf
--- /dev/null
+++ b/src/main/java/org/example/solution5.java
@@ -0,0 +1,10 @@
+package org.example;
+
+public class solution5 {
+ public int solution(int n) {
+ for(int i = 2; i < n; i++) {
+ if(n % i == 1) return i;
+ }
+ return 0;
+ }
+}
From 616d83e7d58ce6542696aa3d8c1e9f6232971743 Mon Sep 17 00:00:00 2001
From: YoungDong99 <114642786+YoungDong99@users.noreply.github.com>
Date: Mon, 8 May 2023 09:07:31 +0900
Subject: [PATCH 11/17] =?UTF-8?q?[=EB=82=98=EB=A8=B8=EC=A7=80=EA=B0=80=201?=
=?UTF-8?q?=EC=9D=B4=EB=90=98=EB=8A=94=20=EC=88=98=20=EC=B0=BE=EA=B8=B0]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
주석 추가
---
src/main/java/org/example/solution5.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/main/java/org/example/solution5.java b/src/main/java/org/example/solution5.java
index 7235abf..6e8272b 100644
--- a/src/main/java/org/example/solution5.java
+++ b/src/main/java/org/example/solution5.java
@@ -1,10 +1,14 @@
package org.example;
public class solution5 {
+ //나머지가 1이 되는 수 찾기
public int solution(int n) {
+ //나머지가 1이 되려면 1보다 커야하므로 2부터 시작
for(int i = 2; i < n; i++) {
if(n % i == 1) return i;
+ //수를 찾으면 종료
}
return 0;
}
+
}
From 599ae6cdd86452d9e24554cc04ec884b566f64b2 Mon Sep 17 00:00:00 2001
From: YoungDong99 <114642786+YoungDong99@users.noreply.github.com>
Date: Mon, 8 May 2023 20:28:34 +0900
Subject: [PATCH 12/17] =?UTF-8?q?[=EB=AC=B8=EC=9E=90=EC=97=B4=20=EB=8B=A4?=
=?UTF-8?q?=EB=A3=A8=EA=B8=B0=20=EA=B8=B0=EB=B3=B8]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/org/example/solution6.java | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 src/main/java/org/example/solution6.java
diff --git a/src/main/java/org/example/solution6.java b/src/main/java/org/example/solution6.java
new file mode 100644
index 0000000..c698c1d
--- /dev/null
+++ b/src/main/java/org/example/solution6.java
@@ -0,0 +1,15 @@
+package org.example;
+
+public class solution6 {
+ //문자열 다루기 기본
+ public boolean solution(String s) {
+ boolean answer = true;
+ int n = s.length();
+ if(n != 4 && n != 6) return false; //조건 불만족시 종료
+ for(char c : s.toCharArray()) {
+ //int 형으로 바꾼 문자가 숫자 범위 바깥이라면 false 반환.
+ if( (int) c < 48 || (int) c > 57) return false;
+ }
+ return answer;
+ }
+}
From ac4b73fd4906cd1cbc868f67717d945d2a9a8cf4 Mon Sep 17 00:00:00 2001
From: YoungDong99 <114642786+YoungDong99@users.noreply.github.com>
Date: Wed, 10 May 2023 09:11:57 +0900
Subject: [PATCH 13/17] =?UTF-8?q?[=ED=95=98=EC=83=A4=EB=93=9C=20=EC=88=98]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/org/example/solution7.java | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 src/main/java/org/example/solution7.java
diff --git a/src/main/java/org/example/solution7.java b/src/main/java/org/example/solution7.java
new file mode 100644
index 0000000..0af7d94
--- /dev/null
+++ b/src/main/java/org/example/solution7.java
@@ -0,0 +1,14 @@
+package org.example;
+
+public class solution7 {
+ public boolean solution(int x) {
+ boolean answer = false;
+ String num = Integer.toString(x); //문자열로 변환
+ int sum = 0;
+ for(char c : num.toCharArray()) {
+ sum += (int) c - '0'; //숫자로 변환
+ }
+ if(x % sum == 0) answer = true; //하샤드 수인지 확인
+ return answer;
+ }
+}
From 701e6069402ffd538f6108d6ab262eb4cae4d7dd Mon Sep 17 00:00:00 2001
From: YoungDong99 <114642786+YoungDong99@users.noreply.github.com>
Date: Thu, 11 May 2023 11:01:28 +0900
Subject: [PATCH 14/17] =?UTF-8?q?[=EC=84=9C=EC=9A=B8=EC=97=90=EC=84=9C=20?=
=?UTF-8?q?=EA=B9=80=EC=84=9C=EB=B0=A9=EC=B0=BE=EA=B8=B0]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/org/example/solution8.java | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 src/main/java/org/example/solution8.java
diff --git a/src/main/java/org/example/solution8.java b/src/main/java/org/example/solution8.java
new file mode 100644
index 0000000..4772c75
--- /dev/null
+++ b/src/main/java/org/example/solution8.java
@@ -0,0 +1,15 @@
+package org.example;
+
+public class solution8 {
+ String answer = "";
+ public String solution(String[] seoul) {
+ int i = 0;
+ for(i = 0; i < seoul.length; i++) {
+ if(seoul[i].equals("Kim")) {
+ return "김서방은 " + i + "에 있다";
+ }
+ }
+
+ return answer;
+ }
+}
From a52f531e10b1aea9ae97ed00a2eb67e5ac220606 Mon Sep 17 00:00:00 2001
From: YoungDong99 <114642786+YoungDong99@users.noreply.github.com>
Date: Thu, 11 May 2023 11:06:44 +0900
Subject: [PATCH 15/17] =?UTF-8?q?[=EC=84=9C=EC=9A=B8=EC=97=90=EC=84=9C=20?=
=?UTF-8?q?=EA=B9=80=EC=84=9C=EB=B0=A9=EC=B0=BE=EA=B8=B0]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/org/example/solution8.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/main/java/org/example/solution8.java b/src/main/java/org/example/solution8.java
index 4772c75..4edee55 100644
--- a/src/main/java/org/example/solution8.java
+++ b/src/main/java/org/example/solution8.java
@@ -3,8 +3,7 @@
public class solution8 {
String answer = "";
public String solution(String[] seoul) {
- int i = 0;
- for(i = 0; i < seoul.length; i++) {
+ for(int i = 0; i < seoul.length; i++) {
if(seoul[i].equals("Kim")) {
return "김서방은 " + i + "에 있다";
}
From 4aed79892cba83757fbe18bbd336f774779a629a Mon Sep 17 00:00:00 2001
From: YoungDong99 <114642786+YoungDong99@users.noreply.github.com>
Date: Thu, 11 May 2023 14:17:35 +0900
Subject: [PATCH 16/17] =?UTF-8?q?[=EC=BD=9C=EB=9D=BC=EC=B8=A0=20=EC=B6=94?=
=?UTF-8?q?=EC=B8=A1]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/org/example/solution9.java | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 src/main/java/org/example/solution9.java
diff --git a/src/main/java/org/example/solution9.java b/src/main/java/org/example/solution9.java
new file mode 100644
index 0000000..1c39c15
--- /dev/null
+++ b/src/main/java/org/example/solution9.java
@@ -0,0 +1,16 @@
+package org.example;
+
+public class solution9 {
+ //콜라츠 추측
+ public long solution(long num) {
+ long answer = 0;
+ if(num == 1) return 0;
+ while(num != 1) {
+ if(answer >= 500) return -1;
+ if(num % 2 == 0) num /= 2;
+ else num = num*3 + 1;
+ answer++;
+ }
+ return answer;
+ }
+}
From 1b5f5a602de7a07dd01827aa740d2235a7338519 Mon Sep 17 00:00:00 2001
From: YoungDong99 <114642786+YoungDong99@users.noreply.github.com>
Date: Thu, 11 May 2023 14:17:49 +0900
Subject: [PATCH 17/17] =?UTF-8?q?--=20=EB=AC=B8=EC=A0=9C=ED=92=80=EC=9D=B4?=
=?UTF-8?q?=20=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/org/example/solution8.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main/java/org/example/solution8.java b/src/main/java/org/example/solution8.java
index 4edee55..1369372 100644
--- a/src/main/java/org/example/solution8.java
+++ b/src/main/java/org/example/solution8.java
@@ -1,6 +1,7 @@
package org.example;
public class solution8 {
+ //서울에서 김서방 찾기
String answer = "";
public String solution(String[] seoul) {
for(int i = 0; i < seoul.length; i++) {