From efa97269ac3cc3434fee0e85d52b7c8bc57cf7a8 Mon Sep 17 00:00:00 2001 From: mninm Date: Sat, 5 Apr 2025 17:15:31 +0900 Subject: [PATCH] some init msg --- .idea/gradle.xml | 16 ++++++++++ .idea/misc.xml | 5 +++ .idea/vcs.xml | 6 ++++ src/main/java/calculator/Application.java | 1 + src/main/java/calculator/Calculator.java | 37 +++++++++++++++++++---- 5 files changed, 59 insertions(+), 6 deletions(-) create mode 100644 .idea/gradle.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..ce1c62c --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,16 @@ + + + + + + + \ 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 diff --git a/src/main/java/calculator/Application.java b/src/main/java/calculator/Application.java index d909a50..893fa5a 100644 --- a/src/main/java/calculator/Application.java +++ b/src/main/java/calculator/Application.java @@ -7,5 +7,6 @@ public static void main(String[] args) { // 예시 코드 Calculator calculator = new Calculator(); calculator.calculate(""); + } } diff --git a/src/main/java/calculator/Calculator.java b/src/main/java/calculator/Calculator.java index 88e8552..92dc6f7 100644 --- a/src/main/java/calculator/Calculator.java +++ b/src/main/java/calculator/Calculator.java @@ -1,13 +1,38 @@ package calculator; - -/* - 1주차에만 제공되는 예시 코드입니다. - 코드는 그대로 사용해도 되고 수정해도 됩니다. - */ +import java.util.Objects; public class Calculator { public int calculate(String input) { // TODO: 코드 구현 - throw new IllegalArgumentException("아직 구현되지 않았습니다."); + if(input.isEmpty()){ + return 0; + } + int result=0; + int num=0; + char b='+'; + for(int i=0;i