diff --git a/src/.idea/.gitignore b/src/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/src/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/src/.idea/misc.xml b/src/.idea/misc.xml new file mode 100644 index 0000000..6f29fee --- /dev/null +++ b/src/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/.idea/modules.xml b/src/.idea/modules.xml new file mode 100644 index 0000000..31eaf94 --- /dev/null +++ b/src/.idea/modules.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/.idea/vcs.xml b/src/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/src/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/ohgiraffers/chap01/section01/literal/Application01.java b/src/main/java/com/ohgiraffers/chap01/section01/literal/Application01.java index f1c5726..dbf4b6a 100644 --- a/src/main/java/com/ohgiraffers/chap01/section01/literal/Application01.java +++ b/src/main/java/com/ohgiraffers/chap01/section01/literal/Application01.java @@ -4,5 +4,13 @@ public class Application01 { public static void main(String[] args){ // 즐거운 자바를 화면에 출력해주세요 // 출력예시) 즐거운 자바 + + String str1 = "즐거운"; + String str2 = "자바"; + + + System.out.println(str1 + " " + str2); + + } } diff --git a/src/main/java/com/ohgiraffers/chap01/section02/variable/Application01.java b/src/main/java/com/ohgiraffers/chap01/section02/variable/Application01.java index 24b2bfb..711b841 100644 --- a/src/main/java/com/ohgiraffers/chap01/section02/variable/Application01.java +++ b/src/main/java/com/ohgiraffers/chap01/section02/variable/Application01.java @@ -4,6 +4,9 @@ public class Application01 { public static void main(String[] args){ // point 변수에 10의 값을 할당하고 화면에 출력해주세요 // 출력 예시) 10 - System.out.println(10); + + int point = 10; + + System.out.println(point); } } diff --git a/src/main/java/com/ohgiraffers/chap02/section01/arithmetic/Application01.java b/src/main/java/com/ohgiraffers/chap02/section01/arithmetic/Application01.java index d49b865..b36e59d 100644 --- a/src/main/java/com/ohgiraffers/chap02/section01/arithmetic/Application01.java +++ b/src/main/java/com/ohgiraffers/chap02/section01/arithmetic/Application01.java @@ -2,26 +2,43 @@ public class Application01 { + public static void main(String[] args) { + + int x = 700000; + int y = 80000; + + Application01 app3 = new Application01(); + + + System.out.println(app3.plus(x,y)); + System.out.println(app3.minus(x,y)); + System.out.println(app3.multiply(x,y)); + System.out.println(app3.divide(x,y)); + + } + + // x, y를 더하는 기능을 만들고 결과를 반환해주세요 - public int plus (int x , int y){ - return 0; + public int plus(int x , int y){ + int result01 = x + y; + return result01; } // x,y를 빼는 기능을 만들고 결과를 반환해주세요 public int minus(int x, int y){ - - return 0; + int result02 = x - y; + return result02; } // x,y를 곱하는 기능을 만들고 결과를 반환해주세요 public long multiply(int x, int y){ - - return 0; + long result03 = (long)x * y; + return result03; } // x, y를 나누고 결과를 반환해주세요 public double divide(int x, int y){ - - return 0.0; + double result04 = (double)x / y; + return result04; } } diff --git a/src/main/java/com/ohgiraffers/chap02/section01/comparsion/Application01.java b/src/main/java/com/ohgiraffers/chap02/section01/comparsion/Application01.java index 520f31e..7964e26 100644 --- a/src/main/java/com/ohgiraffers/chap02/section01/comparsion/Application01.java +++ b/src/main/java/com/ohgiraffers/chap02/section01/comparsion/Application01.java @@ -2,20 +2,35 @@ public class Application01 { + public static void main(String[] args) { + int x = 101; + int y = 201; + + Application01 app1 = new Application01(); + System.out.println(app1.valueCheck(x,y)); + System.out.println(app1.maxNumberOf(x,y)); + System.out.println(app1.rangeNum(x)); + } // 두 수의 값을 비교하여 같으면 true 다르면 false를 출력하는 프로그램을 작성해주세요 public boolean valueCheck(int x, int y){ + return (x == y)? true : false; - return true; } // 두 수의 값을 비교하여 큰 값을 반환하는 프로그램을 작성해주세요 // 만약 같다면 0의 값을 반환합니다. public int maxNumberOf(int x, int y){ - return 0; + return (x==y)?0:(x>y)? x:y; + } + + // int x의 값이 0 ~ 100 사이의 값이 맞다면 true 아니면 false를 출력하는 프로그램을 만들어주세요 public boolean rangeNum(int x){ - return false; + + return (x >= 0 && x <= 100)? true : false; } + + }