[4기 - 김재웅] 1~2주차 과제 : 계산기 구현 미션 제출합니다.

calculator/src/main/java/org/example/CalConfig.java

@@ -0,0 +1,27 @@
+package org.example;
+
+import org.example.Calculate.*;
+import org.example.Input.Input;
+import org.example.Input.UserInput;
+import org.example.Output.Show;
+import org.example.Output.ShowText;
+import org.example.Repository.ExpressionRepository;
+import org.example.Repository.Repository;
+
+public class CalConfig {
+    public Calculate calculate(){
+        return new CalculateImpl(new CalOrderImpl());
+    }
+    public Repository repository(){
+        return new ExpressionRepository();
+    }
+    public Input input(){
+        return new UserInput();
+    }
+    public Show show(){
+        return new ShowText();
+    }
+    public PreProcess preProcess() {
+        return new PreProcessImpl();
+    }
+}

calculator/src/main/java/org/example/Calculate/CalOrder.java

@@ -0,0 +1,9 @@
+package org.example.Calculate;
+
+import java.util.Stack;
+
+public interface CalOrder {
+    void calMultiplyDivide();
+    int calPlusMinus();
+    void setStack(Stack<String> expressionStack);
+}

calculator/src/main/java/org/example/Calculate.java → calculator/src/main/java/org/example/Calculate/CalOrderImpl.java

@@ -1,29 +1,14 @@
-package org.example;
+package org.example.Calculate;
 
 import java.util.Stack;
 
-public class Calculate implements CalOrder{
-    private String expression;
+public class CalOrderImpl implements CalOrder {
+    private int result = 0;
     Stack<String> expressionStack = new Stack<>();
-    ExpressionRepository repository = new ExpressionRepository();
-    int result = 0;
-
-    public Calculate(String expression) {
-        this.expression = expression;
-        String[] expressionArr = expression.split(" ");
-        for (String inputVal : expressionArr) {
-            expressionStack.add(inputVal);
-        }
-    }
-
-    public void calculate(){
-        calPriorityFirst();
-        calPrioritySecond();
-    }
 
     @Override
-    public void calPriorityFirst() {
-        for (int i = 1; i < expressionStack.size(); i+=2) {
+    public void calMultiplyDivide() {
+        for (int i = 1; i < expressionStack.size(); i += 2) {
             if (expressionStack.get(i).equals("*")) {
                 multiply(i);
                 i -= 2;
@@ -35,7 +20,7 @@ public void calPriorityFirst() {
     }
 
     @Override
-    public void calPrioritySecond() {
+    public int calPlusMinus() {
         result = Integer.parseInt(expressionStack.get(0));
         for (int i = 1; i < expressionStack.size(); i += 2) {
             if (expressionStack.get(i).equals("+")) {
@@ -44,11 +29,15 @@ public void calPrioritySecond() {
                 result -= Integer.parseInt(expressionStack.get(i + 1));
             }
         }
-        System.out.println(result);
-        repository.save(expression,result);
+        return result;
+    }
+
+    @Override
+    public void setStack(Stack<String> expressionStack) {
+        this.expressionStack = expressionStack;
     }
 
-    public void multiply(int idx){
+    public void multiply(int idx) {
         result = Integer.parseInt(expressionStack.get(idx - 1)) * Integer.parseInt(expressionStack.get(idx + 1));
         expressionStack.add(idx - 1, String.valueOf(result));
         expressionStack.remove(idx);

calculator/src/main/java/org/example/Calculate/Calculate.java

@@ -0,0 +1,7 @@
+package org.example.Calculate;
+
+import java.util.Stack;
+
+public interface Calculate {
+    int calculate(Stack<String> expressionStack);
+}

calculator/src/main/java/org/example/Calculate/CalculateImpl.java

@@ -0,0 +1,17 @@
+package org.example.Calculate;
+
+import java.util.Stack;
+
+public class CalculateImpl implements Calculate {
+    CalOrder calOrder;
+
+    public CalculateImpl(CalOrder calOrder) {
+        this.calOrder = calOrder;
+    }
+
+    public int calculate(Stack<String> expressionStack) {
+        calOrder.setStack(expressionStack);
+        calOrder.calMultiplyDivide();
+        return calOrder.calPlusMinus();
+    }
+}

calculator/src/main/java/org/example/Calculate/PreProcess.java

@@ -0,0 +1,7 @@
+package org.example.Calculate;
+
+import java.util.Stack;
+
+public interface PreProcess {
+    Stack<String> expressionToStack(String expression);
+}

calculator/src/main/java/org/example/Calculate/PreProcessImpl.java

@@ -0,0 +1,18 @@
+package org.example.Calculate;
+
+import java.util.Stack;
+
+public class PreProcessImpl implements PreProcess{
+    private String expression;
+    Stack<String> expressionStack = new Stack<>();
+    @Override
+    public Stack<String> expressionToStack(String expression) {
+        this.expression = expression;
+        String[] expressionArr = expression.split(" ");
+        expressionStack.clear();
+        for (String inputVal : expressionArr) {
+            expressionStack.add(inputVal);
+        }
+        return expressionStack;
+    }
+}

calculator/src/main/java/org/example/Input/Input.java

@@ -0,0 +1,6 @@
+package org.example.Input;
+
+public interface Input {
+    int inputChoice();
+    String inputExpression();
+}

calculator/src/main/java/org/example/Input/UserInput.java

@@ -0,0 +1,17 @@
+package org.example.Input;
+
+import java.util.Scanner;
+
+public class UserInput implements Input {
+    Scanner scanner = new Scanner(System.in);
+    @Override
+    public int inputChoice() {
+        return scanner.nextInt();
+    }
+
+    @Override
+    public String inputExpression() {
+        scanner.nextLine();
+        return scanner.nextLine();
+    }
+}

calculator/src/main/java/org/example/Main.java

@@ -1,36 +1,39 @@
 package org.example;
 
+import org.example.Calculate.Calculate;
+import org.example.Calculate.PreProcess;
+import org.example.Input.Input;
+import org.example.Output.Show;
+import org.example.Repository.Repository;
+
 import java.util.List;
-import java.util.Scanner;
+import java.util.Stack;
 
 public class Main {
+    private static int choice;
     public static void main(String[] args) {
-
-        int choice = 0;
+        CalConfig calConfig = new CalConfig();
+        Calculate calculator = calConfig.calculate();
+        Repository repository = calConfig.repository();
+        Input input = calConfig.input();
+        Show show = calConfig.show();
+        PreProcess preProcess = calConfig.preProcess();
 
         while (true) {
-            choice = getChoice();
+            show.showMenu();
+            choice = input.inputChoice();
             System.out.println();
             if (choice == 1) {
-                new UserInterfaceImpl().showRecord();
+                List<String> records = repository.getRecords();
+                show.showRecords(records);
             } else {
-                String expression = typeExpression();
-                new Calculate(expression).calculate();
+                String expression = input.inputExpression();
+                Stack<String> expressionStack = preProcess.expressionToStack(expression);
+                int result = calculator.calculate(expressionStack);
+                repository.save(expression,result);
+                show.showResult(result);
             }
             System.out.println();
         }
     }
-
-    public static int getChoice() {
-        Scanner scanner = new Scanner(System.in);
-
-        System.out.println("1. 조회\n2. 계산\n");
-        System.out.print("선택 : ");
-        return scanner.nextInt();
-    }
-
-    public static String typeExpression() {
-        Scanner scanner = new Scanner(System.in);
-        return scanner.nextLine();
-    }
 }

calculator/src/main/java/org/example/Output/Show.java

@@ -0,0 +1,9 @@
+package org.example.Output;
+
+import java.util.List;
+
+public interface Show {
+    void showMenu();
+    void showRecords(List<String> records);
+    void showResult(int result);
+}

calculator/src/main/java/org/example/Output/ShowText.java

@@ -0,0 +1,21 @@
+package org.example.Output;
+
+import java.util.List;
+
+public class ShowText implements Show{
+    @Override
+    public void showMenu() {
+        System.out.println("1. 조회\n2. 계산\n");
+        System.out.print("선택 : ");
+    }
+
+    @Override
+    public void showRecords(List<String> records) {
+        records.forEach(System.out::println);
+    }
+
+    @Override
+    public void showResult(int result) {
+        System.out.println(result);
+    }
+}

calculator/src/main/java/org/example/ExpressionRepository.java → calculator/src/main/java/org/example/Repository/ExpressionRepository.java

@@ -1,4 +1,4 @@
-package org.example;
+package org.example.Repository;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -12,7 +12,7 @@ public void save(String expression, int result) {
     }
 
     @Override
-    public List<String> getRecord() {
+    public List<String> getRecords() {
         return store;
     }
 }

calculator/src/main/java/org/example/Repository.java → calculator/src/main/java/org/example/Repository/Repository.java

@@ -1,8 +1,8 @@
-package org.example;
+package org.example.Repository;
 
 import java.util.List;
 
 public interface Repository {
     void save(String expression, int result);
-    List<String> getRecord();
+    List<String> getRecords();
 }