diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..b63da4551 --- /dev/null +++ b/.gitignore @@ -0,0 +1,42 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index c1c982e55..000000000 --- a/README.md +++ /dev/null @@ -1,69 +0,0 @@ -# java_calculator -자바 계산기 구현 미션 Repository입니다. - -### 이곳은 공개 Repo입니다. -1. 여러분의 포트폴리오로 사용하셔도 됩니다. -2. 때문에 이 repo를 fork한 뒤 -3. 여러분의 개인 Repo에 작업하며 -4. 이 Repo에 PR을 보내어 멘토의 코드 리뷰와 피드백을 받으세요. - -### Branch 명명 규칙 + 팀의 PR규칙 정하기 -1. 여러분 repo는 알아서 해주시고 😀(본인 레포니 main으로 하셔두 되져) -2. prgrms-be-devcourse/spring-board 레포로 PR시 branch는 gituser_id을 적어주세요 :) - - base repo : `여기repo` base : `username` ← head repo : `여러분repo` compare : `main`또는 `github_id` -3. 실제 진행할 PR규칙은 멘토+팀원들과 정하여 진행해주세요 :) - - ← head repo : `여러분repo` compare : `main`로 할지 - - 또는 ← head repo : `여러분repo` compare : `github_id`로 할지 -- 참고 : [Github 위치 및 피드백 기준 가이드](https://www.notion.so/backend-devcourse/Github-e1a0908a6bbf4aeaa5a62981499bb215) - -### 과제를 통해 기대하는 역량 - -- 깃허브를 통한 코드리뷰를 경험해보자 -- 기본적인 테스트 코드 작성 및 활용하는 능력해보자 -- 스스로 OOP를 생각하고 코드로 옮길 수 있는 능력해보자 - -### 요구사항 -- 콘솔로 구현입니다.(스윙으로 구현하시는 분들 계실까봐) -- 객체지향적인 코드로 계산기 구현하기 - - [ ] 더하기 - - [ ] 빼기 - - [ ] 곱하기 - - [ ] 나누기 - - [ ] 우선순위(사칙연산) -- [ ] 테스트 코드 구현하기 -- [ ] 계산 이력을 맵으로 데이터 저장기능 만들기 - - 애플리케이션이 동작하는 동안 데이터베이스 외에 데이터를 저장할 수 있는 방법을 고안해보세요. -- (선택) 정규식 사용 - -### 실행결과(콘솔) -``` -1. 조회 -2. 계산 - -선택 : 2 - -1 + 2 -3 - -1. 조회 -2. 계산 - -선택 : 2 - -1 + 2 * 3 -7 - -1. 조회 -2. 계산 - -선택 : 1 - -1 + 2 = 3 -1 + 2 * 3 = 7 - -선택 : 2 - -3 - 2 * 2 --1 -``` - diff --git a/build.gradle b/build.gradle new file mode 100644 index 000000000..f7beddb94 --- /dev/null +++ b/build.gradle @@ -0,0 +1,19 @@ +plugins { + id 'java' +} + +group = 'org.example' +version = '1.0-SNAPSHOT' + +repositories { + mavenCentral() +} + +dependencies { + testImplementation platform('org.junit:junit-bom:5.9.1') + testImplementation 'org.junit.jupiter:junit-jupiter' +} + +test { + useJUnitPlatform() +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..249e5832f Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..38faf3510 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Thu Jun 15 20:24:08 KST 2023 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 000000000..1b6c78733 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..ac1b06f93 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 000000000..930f769a2 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'Calculator' + diff --git a/src/main/java/org/programmers/App.java b/src/main/java/org/programmers/App.java new file mode 100644 index 000000000..04c67ffbe --- /dev/null +++ b/src/main/java/org/programmers/App.java @@ -0,0 +1,35 @@ +package org.programmers; + +import org.programmers.calculator.Calculator; +import org.programmers.calculator.PostfixCalculator; +import org.programmers.controller.AppController; +import org.programmers.controller.CalculatorManagement; +import org.programmers.converter.Converter; +import org.programmers.converter.PostfixConverter; +import org.programmers.expression.ExpressionValidator; +import org.programmers.io.*; +import org.programmers.repository.ExpressionRepository; +import org.programmers.repository.Repository; + +public class App { + public static void main(String[] args) { + + // console + Input input = new ConsoleInput(); + Output output = new ConsoleOutput(); + Console console = new Console(input, output); + + // repository + Repository repository = new ExpressionRepository(); + + // calculator + ExpressionValidator validator = new ExpressionValidator(); + Calculator calculator = new PostfixCalculator(validator); + Converter converter = new PostfixConverter(validator); + + // controller + CalculatorManagement calculatorManagement = new CalculatorManagement(calculator, converter); + AppController appController = new AppController(console, repository, calculatorManagement); + appController.run(); + } +} \ No newline at end of file diff --git a/src/main/java/org/programmers/calculator/Calculator.java b/src/main/java/org/programmers/calculator/Calculator.java new file mode 100644 index 000000000..c2ecac1aa --- /dev/null +++ b/src/main/java/org/programmers/calculator/Calculator.java @@ -0,0 +1,21 @@ +package org.programmers.calculator; + +import org.programmers.constant.Operator; +import org.programmers.expression.ExpressionParam; +import org.programmers.expression.ExpressionResult; +import org.programmers.expression.ExpressionValidator; + +public abstract class Calculator { + + protected final ExpressionValidator validator; + + public Calculator(ExpressionValidator validator) { + this.validator = validator; + } + + public abstract ExpressionResult calculate(ExpressionParam param); + + protected double getCalculationResult(String symbol, double operand1, double operand2) { + return Operator.find(symbol).get().getAnswer(operand1, operand2); + } +} diff --git a/src/main/java/org/programmers/calculator/PostfixCalculator.java b/src/main/java/org/programmers/calculator/PostfixCalculator.java new file mode 100644 index 000000000..7908e5744 --- /dev/null +++ b/src/main/java/org/programmers/calculator/PostfixCalculator.java @@ -0,0 +1,35 @@ +package org.programmers.calculator; + +import org.programmers.expression.ExpressionParam; +import org.programmers.expression.ExpressionResult; +import org.programmers.expression.ExpressionValidator; + +import java.util.Stack; + +public class PostfixCalculator extends Calculator { + + public PostfixCalculator(ExpressionValidator validator) { + super(validator); + } + + @Override + public ExpressionResult calculate(ExpressionParam param) { + Stack calculateStack = new Stack<>(); + + for (String element : param.getPostfix()) { + if (validator.isOperator(element)) { + double firstOperand = Double.parseDouble(calculateStack.pop()); + double secondOperand = Double.parseDouble(calculateStack.pop()); + + double result = getCalculationResult(element, firstOperand, secondOperand); + + calculateStack.push(String.valueOf(result)); + } else { + calculateStack.push(element); + } + } + double answer = Double.parseDouble(calculateStack.pop()); + + return new ExpressionResult(param.getOriginalExpression(), answer); + } +} diff --git a/src/main/java/org/programmers/constant/ExpressionSymbol.java b/src/main/java/org/programmers/constant/ExpressionSymbol.java new file mode 100644 index 000000000..2bdf01670 --- /dev/null +++ b/src/main/java/org/programmers/constant/ExpressionSymbol.java @@ -0,0 +1,15 @@ +package org.programmers.constant; + +public enum ExpressionSymbol { + EQUAL_SYMBOL("="), BLANK_SYMBOL(" "); + + private final String symbol; + + ExpressionSymbol(String symbol) { + this.symbol = symbol; + } + + public String getSymbol() { + return symbol; + } +} diff --git a/src/main/java/org/programmers/constant/Operator.java b/src/main/java/org/programmers/constant/Operator.java new file mode 100644 index 000000000..45fbf870d --- /dev/null +++ b/src/main/java/org/programmers/constant/Operator.java @@ -0,0 +1,44 @@ +package org.programmers.constant; + +import java.util.Arrays; +import java.util.Optional; +import java.util.function.BiFunction; + +public enum Operator { + PLUS("+", 10, (o1, o2) -> o1 + o2), + + MINUS("-", 10, (o1, o2) -> o2 - o1), + + MULTI("*", 1, (o1, o2) -> o1 * o2), + + DIVISION("/", 1, (o1, o2) -> { + if (o1 == 0) throw new IllegalArgumentException("0으로 나눌 수 없습니다.."); + return o2 / o1; + }); + + private final String symbol; + + private final int priority; + + private final BiFunction expression; + + Operator(String symbol, int priority, BiFunction expression) { + this.symbol = symbol; + this.priority = priority; + this.expression = expression; + } + + public static Optional find(String symbol) { + return Arrays.stream(Operator.values()) + .filter(operator -> operator.symbol.equals(symbol)) + .findAny(); + } + + public int getPriority() { + return priority; + } + + public double getAnswer(double operand1, double operand2) { + return expression.apply(operand1, operand2); + } +} diff --git a/src/main/java/org/programmers/constant/Selection.java b/src/main/java/org/programmers/constant/Selection.java new file mode 100644 index 000000000..98e27ecb9 --- /dev/null +++ b/src/main/java/org/programmers/constant/Selection.java @@ -0,0 +1,20 @@ +package org.programmers.constant; + +import java.util.Arrays; + +public enum Selection { + ERROR(0), HISTORY(1), CALCULATION(2), EXIT(3); + + private final int code; + + Selection(int code) { + this.code = code; + } + + public static Selection find(int code) { + return Arrays.stream(Selection.values()) + .filter(selection -> selection.code == code) + .findAny() + .orElseThrow(() -> new IllegalArgumentException("올바르지 않은 메뉴 번호가 입력되었습니다.")); + } +} diff --git a/src/main/java/org/programmers/controller/AppController.java b/src/main/java/org/programmers/controller/AppController.java new file mode 100644 index 000000000..521a2aba2 --- /dev/null +++ b/src/main/java/org/programmers/controller/AppController.java @@ -0,0 +1,56 @@ +package org.programmers.controller; + +import org.programmers.constant.Selection; +import org.programmers.expression.ExpressionResult; +import org.programmers.io.Console; +import org.programmers.repository.Repository; + +public class AppController { + + private final Console console; + private final Repository repository; + private final CalculatorManagement calculatorManagement; + + public AppController(Console console, Repository repository, CalculatorManagement calculatorManagement) { + this.console = console; + this.repository = repository; + this.calculatorManagement = calculatorManagement; + } + + public void run() { + while (true) { + console.getOutput().printConsole(); + int number = console.getInput().inputNumber(); + Selection selection = Selection.find(number); + + switch (selection) { + case ERROR: + console.getOutput().printError(); + break; + case HISTORY: + getAllAndPrint(); + break; + case CALCULATION: + computeAndPrint(); + break; + case EXIT: + return; + } + } + } + + private void getAllAndPrint() { + console.getOutput().printHistory(repository.getAll()); + } + + private void computeAndPrint() { + String inputExpression = console.getInput().inputExpression(); + try { + ExpressionResult expressionResult = calculatorManagement.runCalculator(inputExpression); + console.getOutput().printAnswer(expressionResult.getAnswer()); + repository.save(expressionResult); + } catch (IllegalArgumentException e) { + System.out.println("잘못된 식을 입력하였습니다."); + } + } +} diff --git a/src/main/java/org/programmers/controller/CalculatorManagement.java b/src/main/java/org/programmers/controller/CalculatorManagement.java new file mode 100644 index 000000000..c6a2c6d35 --- /dev/null +++ b/src/main/java/org/programmers/controller/CalculatorManagement.java @@ -0,0 +1,25 @@ +package org.programmers.controller; + +import org.programmers.calculator.Calculator; +import org.programmers.converter.Converter; +import org.programmers.expression.ExpressionParam; +import org.programmers.expression.ExpressionResult; + +public class CalculatorManagement { + + private final Calculator calculator; + + private final Converter converter; + + public CalculatorManagement(Calculator calculator, Converter converter) { + this.calculator = calculator; + this.converter = converter; + } + + public ExpressionResult runCalculator(String expression) { + ExpressionParam param = converter.convert(expression); + ExpressionResult result = calculator.calculate(param); + + return result; + } +} diff --git a/src/main/java/org/programmers/converter/Converter.java b/src/main/java/org/programmers/converter/Converter.java new file mode 100644 index 000000000..b92fc8273 --- /dev/null +++ b/src/main/java/org/programmers/converter/Converter.java @@ -0,0 +1,7 @@ +package org.programmers.converter; + +import org.programmers.expression.ExpressionParam; + +public interface Converter { + ExpressionParam convert(String expression); +} diff --git a/src/main/java/org/programmers/converter/PostfixConverter.java b/src/main/java/org/programmers/converter/PostfixConverter.java new file mode 100644 index 000000000..b0bd3076d --- /dev/null +++ b/src/main/java/org/programmers/converter/PostfixConverter.java @@ -0,0 +1,68 @@ +package org.programmers.converter; + +import org.programmers.constant.Operator; +import org.programmers.expression.ExpressionParam; +import org.programmers.expression.ExpressionValidator; + +import java.util.ArrayList; +import java.util.List; +import java.util.Stack; + +public class PostfixConverter implements Converter { + + private final ExpressionValidator validator; + + public PostfixConverter(ExpressionValidator validator) { + this.validator = validator; + } + + @Override + public ExpressionParam convert(String expression) { + StringBuilder number = new StringBuilder(); + List postfix = new ArrayList<>(); + Stack operatorStack = new Stack<>(); + + for (String element : expression.split("")) { + if (validator.isOperator(element)) { + addToPostfix(postfix, number.toString()); + number.delete(0, number.length()); + + comparePriority(operatorStack, postfix, element); + operatorStack.push(element); + + } else if (validator.isNumber(element)) { + number.append(element); + + } else { + throw new IllegalArgumentException("잘못된 식을 입력하였습니다."); + } + } + addToPostfix(postfix, number.toString()); + popOperator(operatorStack, postfix); + + return new ExpressionParam(postfix, expression); + } + + private int getOperatorPriority(String symbol) { + return Operator.find(symbol).get().getPriority(); + } + + private void comparePriority(Stack operatorStack, List postfix, String symbol) { + int currentPriority = getOperatorPriority(symbol); + + while (!operatorStack.empty() && (currentPriority >= getOperatorPriority(operatorStack.peek()))) { + String operator = operatorStack.pop(); + addToPostfix(postfix, operator); + } + } + + private void popOperator(Stack operatorStack, List postfix) { + while (!operatorStack.empty()) { + addToPostfix(postfix, operatorStack.pop()); + } + } + + private void addToPostfix(List postfix, String exp) { + postfix.add(exp); + } +} diff --git a/src/main/java/org/programmers/expression/ExpressionParam.java b/src/main/java/org/programmers/expression/ExpressionParam.java new file mode 100644 index 000000000..bbda7e80e --- /dev/null +++ b/src/main/java/org/programmers/expression/ExpressionParam.java @@ -0,0 +1,23 @@ +package org.programmers.expression; + +import java.util.List; + +public class ExpressionParam { + + private final List postfix; + + private final String originalExpression; + + public List getPostfix() { + return postfix; + } + + public String getOriginalExpression() { + return originalExpression; + } + + public ExpressionParam(List postfix, String originalExpression) { + this.postfix = postfix; + this.originalExpression = originalExpression; + } +} diff --git a/src/main/java/org/programmers/expression/ExpressionResult.java b/src/main/java/org/programmers/expression/ExpressionResult.java new file mode 100644 index 000000000..b0671b5c6 --- /dev/null +++ b/src/main/java/org/programmers/expression/ExpressionResult.java @@ -0,0 +1,32 @@ +package org.programmers.expression; + +import org.programmers.constant.ExpressionSymbol; + +public class ExpressionResult { + + private final String expression; + + private final double answer; + + public ExpressionResult(String expression, double answer) { + this.expression = expression; + this.answer = answer; + } + + public double getAnswer() { + return answer; + } + + @Override + public String toString() { + return makeExpression(); + } + + private String makeExpression() { + return expression + + ExpressionSymbol.BLANK_SYMBOL.getSymbol() + + ExpressionSymbol.EQUAL_SYMBOL.getSymbol() + + ExpressionSymbol.BLANK_SYMBOL.getSymbol() + + answer; + } +} diff --git a/src/main/java/org/programmers/expression/ExpressionValidator.java b/src/main/java/org/programmers/expression/ExpressionValidator.java new file mode 100644 index 000000000..01f906cca --- /dev/null +++ b/src/main/java/org/programmers/expression/ExpressionValidator.java @@ -0,0 +1,17 @@ +package org.programmers.expression; + +import org.programmers.constant.Operator; + +public class ExpressionValidator { + + public boolean isOperator(String symbol) { + return Operator.find(symbol).isPresent(); + } + + public boolean isNumber(String number) { + if (number.length() == 1) { + return number.charAt(0) >= '0' && number.charAt(0) <= '9'; + } + return false; + } +} diff --git a/src/main/java/org/programmers/io/Console.java b/src/main/java/org/programmers/io/Console.java new file mode 100644 index 000000000..297a1215f --- /dev/null +++ b/src/main/java/org/programmers/io/Console.java @@ -0,0 +1,20 @@ +package org.programmers.io; + +public class Console { + + private final Input input; + private final Output output; + + public Console(Input input, Output output) { + this.input = input; + this.output = output; + } + + public Input getInput() { + return input; + } + + public Output getOutput() { + return output; + } +} diff --git a/src/main/java/org/programmers/io/ConsoleInput.java b/src/main/java/org/programmers/io/ConsoleInput.java new file mode 100644 index 000000000..7ddda3f4f --- /dev/null +++ b/src/main/java/org/programmers/io/ConsoleInput.java @@ -0,0 +1,27 @@ +package org.programmers.io; + +import java.util.InputMismatchException; +import java.util.Scanner; + +public class ConsoleInput implements Input { + + private final Scanner scanner; + + public ConsoleInput() { + scanner = new Scanner(System.in); + } + + public int inputNumber() { + try { + return scanner.nextInt(); + } catch (InputMismatchException e) { + scanner.nextLine(); + return 0; + } + } + + public String inputExpression() { + scanner.nextLine(); + return scanner.nextLine(); + } +} diff --git a/src/main/java/org/programmers/io/ConsoleOutput.java b/src/main/java/org/programmers/io/ConsoleOutput.java new file mode 100644 index 000000000..9001a6934 --- /dev/null +++ b/src/main/java/org/programmers/io/ConsoleOutput.java @@ -0,0 +1,34 @@ +package org.programmers.io; + +import org.programmers.expression.ExpressionResult; + +import java.util.Map; + +public class ConsoleOutput implements Output { + + public void printConsole() { + System.out.println("1. 조회"); + System.out.println("2. 계산"); + System.out.println("3. 종료"); + System.out.print("선택 : "); + } + + @Override + public void printAnswer(double answer) { + System.out.println(answer + "\n"); + } + + @Override + public void printError() { + System.out.println("올바르지 않은 메뉴 번호가 입력되었습니다."); + } + + + @Override + public void printHistory(Map history) { + for (long i = history.size() - 1; i >= 0; i--) { + System.out.println(history.get(i).toString()); + } + System.out.println(); + } +} diff --git a/src/main/java/org/programmers/io/Input.java b/src/main/java/org/programmers/io/Input.java new file mode 100644 index 000000000..d161d8dc8 --- /dev/null +++ b/src/main/java/org/programmers/io/Input.java @@ -0,0 +1,8 @@ +package org.programmers.io; + +public interface Input { + + int inputNumber(); + + String inputExpression(); +} diff --git a/src/main/java/org/programmers/io/Output.java b/src/main/java/org/programmers/io/Output.java new file mode 100644 index 000000000..c22af53d9 --- /dev/null +++ b/src/main/java/org/programmers/io/Output.java @@ -0,0 +1,16 @@ +package org.programmers.io; + +import org.programmers.expression.ExpressionResult; + +import java.util.Map; + +public interface Output { + + void printConsole(); + + void printAnswer(double answer); + + void printError(); + + void printHistory(Map history); +} diff --git a/src/main/java/org/programmers/repository/ExpressionRepository.java b/src/main/java/org/programmers/repository/ExpressionRepository.java new file mode 100644 index 000000000..9a87077a0 --- /dev/null +++ b/src/main/java/org/programmers/repository/ExpressionRepository.java @@ -0,0 +1,27 @@ +package org.programmers.repository; + +import org.programmers.expression.ExpressionResult; + +import java.util.HashMap; +import java.util.Map; + +public class ExpressionRepository implements Repository { + + private final Map historyMap; + + private long idx = 0L; + + public ExpressionRepository() { + this.historyMap = new HashMap<>(); + } + + @Override + public void save(ExpressionResult expression) { + historyMap.put(idx++, expression); + } + + @Override + public Map getAll() { + return historyMap; + } +} diff --git a/src/main/java/org/programmers/repository/Repository.java b/src/main/java/org/programmers/repository/Repository.java new file mode 100644 index 000000000..410493519 --- /dev/null +++ b/src/main/java/org/programmers/repository/Repository.java @@ -0,0 +1,12 @@ +package org.programmers.repository; + +import org.programmers.expression.ExpressionResult; + +import java.util.Map; + +public interface Repository { + + void save(ExpressionResult object); + + Map getAll(); +} diff --git a/src/test/java/org/programmers/calculator/PostfixCalculatorTest.java b/src/test/java/org/programmers/calculator/PostfixCalculatorTest.java new file mode 100644 index 000000000..de8847819 --- /dev/null +++ b/src/test/java/org/programmers/calculator/PostfixCalculatorTest.java @@ -0,0 +1,42 @@ +package org.programmers.calculator; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.programmers.converter.Converter; +import org.programmers.converter.PostfixConverter; +import org.programmers.expression.ExpressionParam; +import org.programmers.expression.ExpressionResult; +import org.programmers.expression.ExpressionValidator; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class PostfixCalculatorTest { + + @Test + @DisplayName("계산 성공 테스트") + void calculateSuccess() { + ExpressionValidator validator = new ExpressionValidator(); + Calculator calculator = new PostfixCalculator(validator); + Converter converter = new PostfixConverter(validator); + + ExpressionParam param = converter.convert("3+4*5"); + ExpressionResult expressionResult = calculator.calculate(param); + double result = expressionResult.getAnswer(); + + assertThat(result).isEqualTo(23); + } + + @Test + @DisplayName("잘못된 식을 넣으면 예외가 발생한다.") + void calculateException() { + ExpressionValidator validator = new ExpressionValidator(); + Calculator calculator = new PostfixCalculator(validator); + Converter converter = new PostfixConverter(validator); + + ExpressionParam param = converter.convert("3+4**5"); + assertThatThrownBy(() -> calculator.calculate(param)) + .isInstanceOf(IllegalArgumentException.class); + } + +} \ No newline at end of file diff --git a/src/test/java/org/programmers/constant/OperatorTest.java b/src/test/java/org/programmers/constant/OperatorTest.java new file mode 100644 index 000000000..35adf6fc7 --- /dev/null +++ b/src/test/java/org/programmers/constant/OperatorTest.java @@ -0,0 +1,45 @@ +package org.programmers.constant; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class OperatorTest { + + @Test + @DisplayName("더하기 성공 테스트") + void addSuccessTest() { + double result = Operator.PLUS.getAnswer(3, 4); + assertThat(result).isEqualTo(7.0); + } + + @Test + @DisplayName("빼기 성공 테스트") + void subtractSuccessTest() { + double result = Operator.MINUS.getAnswer(3, 4); + assertThat(result).isEqualTo(1.0); + } + + @Test + @DisplayName("곱하기 성공 테스트") + void multiplySuccessTest() { + double result = Operator.MULTI.getAnswer(3, 4); + assertThat(result).isEqualTo(12.0); + } + + @Test + @DisplayName("나누기 성공 테스트") + void divideSuccessTest() { + double result = Operator.DIVISION.getAnswer(4, 3); + assertThat(result).isEqualTo(0.75); + } + + @Test + @DisplayName("0으로 나누면 예외가 발생한다.") + void divideExceptionTest() { + assertThatThrownBy(() -> Operator.DIVISION.getAnswer(0, 3)) + .isInstanceOf(IllegalArgumentException.class); + } +} \ No newline at end of file diff --git a/src/test/java/org/programmers/converter/PostfixConverterTest.java b/src/test/java/org/programmers/converter/PostfixConverterTest.java new file mode 100644 index 000000000..df1bf0210 --- /dev/null +++ b/src/test/java/org/programmers/converter/PostfixConverterTest.java @@ -0,0 +1,27 @@ +package org.programmers.converter; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.programmers.expression.ExpressionParam; +import org.programmers.expression.ExpressionValidator; + +import static org.assertj.core.api.Assertions.assertThat; + +class PostfixConverterTest { + + @Test + @DisplayName("후위표기식 변환 테스트") + void toPostfixTest() { + Converter converter = new PostfixConverter(new ExpressionValidator()); + + String expression = "3+4*2"; + String expression2 = "15-5*2"; + + ExpressionParam param = converter.convert(expression); + assertThat(param.getPostfix().get(1)).isEqualTo("4"); + assertThat(param.getPostfix().get(3)).isEqualTo("*"); + + ExpressionParam param2 = converter.convert(expression2); + assertThat(param2.getPostfix().get(0)).isEqualTo("15"); + } +} \ No newline at end of file diff --git a/src/test/java/org/programmers/repository/ExpressionRepositoryTest.java b/src/test/java/org/programmers/repository/ExpressionRepositoryTest.java new file mode 100644 index 000000000..28a645e02 --- /dev/null +++ b/src/test/java/org/programmers/repository/ExpressionRepositoryTest.java @@ -0,0 +1,22 @@ +package org.programmers.repository; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.programmers.expression.ExpressionResult; + +import static org.junit.jupiter.api.Assertions.*; + +class ExpressionRepositoryTest { + + @Test + @DisplayName("저장 테스트") + void saveTest() { + ExpressionResult result = new ExpressionResult("1+1", 2.0); + Repository repository = new ExpressionRepository(); + + repository.save(result); + + assertEquals(repository.getAll().get(0L).getAnswer(), 2.0); + } + +} \ No newline at end of file