From 32dbff196dc26aaa8659db232303d4df6a35b58b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=99=A9=EC=B0=BD=ED=98=84?= Date: Sun, 4 Jun 2023 11:11:21 +0900 Subject: [PATCH 01/34] initial commit --- .gitignore | 170 ++++++++++++++++ .idea/.gitignore | 8 + .idea/compiler.xml | 6 + .idea/jarRepositories.xml | 20 ++ .idea/misc.xml | 10 + .idea/vcs.xml | 6 + build.gradle | 19 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 60756 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 234 +++++++++++++++++++++++ gradlew.bat | 89 +++++++++ settings.gradle | 2 + 12 files changed, 570 insertions(+) create mode 100644 .gitignore create mode 100644 .idea/.gitignore create mode 100644 .idea/compiler.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/vcs.xml create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..73281d9dc --- /dev/null +++ b/.gitignore @@ -0,0 +1,170 @@ +# Created by https://www.toptal.com/developers/gitignore/api/java,intellij,gradle +# Edit at https://www.toptal.com/developers/gitignore?templates=java,intellij,gradle + +### Intellij ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### Intellij Patch ### +# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 + +# *.iml +# modules.xml +# .idea/misc.xml +# *.ipr + +# Sonarlint plugin +# https://plugins.jetbrains.com/plugin/7973-sonarlint +.idea/**/sonarlint/ + +# SonarQube Plugin +# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin +.idea/**/sonarIssues.xml + +# Markdown Navigator plugin +# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced +.idea/**/markdown-navigator.xml +.idea/**/markdown-navigator-enh.xml +.idea/**/markdown-navigator/ + +# Cache file creation bug +# See https://youtrack.jetbrains.com/issue/JBR-2257 +.idea/$CACHE_FILE$ + +# CodeStream plugin +# https://plugins.jetbrains.com/plugin/12206-codestream +.idea/codestream.xml + +# Azure Toolkit for IntelliJ plugin +# https://plugins.jetbrains.com/plugin/8053-azure-toolkit-for-intellij +.idea/**/azureSettings.xml + +### Java ### +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* +replay_pid* + +### Gradle ### +.gradle +**/build/ +!src/**/build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Avoid ignore Gradle wrappper properties +!gradle-wrapper.properties + +# Cache of project +.gradletasknamecache + +# Eclipse Gradle plugin generated files +# Eclipse Core +.project +# JDT-specific (Eclipse Java Development Tools) +.classpath + +### Gradle Patch ### +# Java heap dump +*.hprof + +# End of https://www.toptal.com/developers/gitignore/api/java,intellij,gradle \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 000000000..13566b81b --- /dev/null +++ b/.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/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 000000000..fb7f4a8a4 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 000000000..fdc392fe8 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 000000000..5d9825616 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 000000000..35eb1ddfb --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 000000000..f952fb936 --- /dev/null +++ b/build.gradle @@ -0,0 +1,19 @@ +plugins { + id 'java' +} + +group = 'org.programmers.java' +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 0000000000000000000000000000000000000000..249e5832f090a2944b7473328c07c9755baa3196 GIT binary patch literal 60756 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 '} + 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..05fdde88c --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'JavaCalculator' + From d91bdceca6a363fc4949b3d295784fe3419930cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=99=A9=EC=B0=BD=ED=98=84?= Date: Sun, 4 Jun 2023 16:50:55 +0900 Subject: [PATCH 02/34] =?UTF-8?q?feat:=20=EC=BD=98=EC=86=94=20Input,=20Out?= =?UTF-8?q?put=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/programmers/java/App.java | 11 ++++ .../java/org/programmers/java/Calculator.java | 36 +++++++++++ .../org/programmers/java/console/Console.java | 62 +++++++++++++++++++ .../org/programmers/java/console/Input.java | 6 ++ .../org/programmers/java/console/Output.java | 13 ++++ .../programmers/java/message/ErrorMsg.java | 15 +++++ .../org/programmers/java/message/InfoMsg.java | 19 ++++++ 7 files changed, 162 insertions(+) create mode 100644 src/main/java/org/programmers/java/App.java create mode 100644 src/main/java/org/programmers/java/Calculator.java create mode 100644 src/main/java/org/programmers/java/console/Console.java create mode 100644 src/main/java/org/programmers/java/console/Input.java create mode 100644 src/main/java/org/programmers/java/console/Output.java create mode 100644 src/main/java/org/programmers/java/message/ErrorMsg.java create mode 100644 src/main/java/org/programmers/java/message/InfoMsg.java diff --git a/src/main/java/org/programmers/java/App.java b/src/main/java/org/programmers/java/App.java new file mode 100644 index 000000000..31928036e --- /dev/null +++ b/src/main/java/org/programmers/java/App.java @@ -0,0 +1,11 @@ +package org.programmers.java; + +import org.programmers.java.console.Console; + +public class App { + public static void main(String[] args){ + Console console = new Console(); + Calculator calculator = new Calculator(console, console); + calculator.run(); + } +} diff --git a/src/main/java/org/programmers/java/Calculator.java b/src/main/java/org/programmers/java/Calculator.java new file mode 100644 index 000000000..b4a98cbaf --- /dev/null +++ b/src/main/java/org/programmers/java/Calculator.java @@ -0,0 +1,36 @@ +package org.programmers.java; + +import org.programmers.java.console.Input; +import org.programmers.java.console.Output; +import org.programmers.java.message.ErrorMsg; + +public class Calculator { + private boolean exitStatus = true; + private Input input; + private Output output; + + Calculator(Input input, Output output){ + this.input = input; + this.output = output; + } + + void run() { + while (exitStatus) { + output.menuMsg(); + String inputNum = input.numInput(); + output.selectMsg(inputNum); + switch (inputNum) { + case "1": + break; + case "2": + break; + case "3": + output.exitMsg(); + exitStatus = false; + break; + default: + System.out.println(ErrorMsg.SELECT_VALIDATION_ERROR_MSG.getErrorMsg()); + } + } + } +} diff --git a/src/main/java/org/programmers/java/console/Console.java b/src/main/java/org/programmers/java/console/Console.java new file mode 100644 index 000000000..487320485 --- /dev/null +++ b/src/main/java/org/programmers/java/console/Console.java @@ -0,0 +1,62 @@ +package org.programmers.java.console; + +import org.programmers.java.message.InfoMsg; + +import java.util.Map; +import java.util.Scanner; + +public class Console implements Input, Output { + private final Scanner scanner = new Scanner(System.in); + + @Override + public String numInput() { + String numInput = scanner.nextLine(); + return numInput; + } + + @Override + public String calculationInput() { + String calculationInput = scanner.nextLine(); + return calculationInput; + } + + @Override + public void menuMsg() { + System.out.println(InfoMsg.SELECT_MESSGAE.getInfoMsg()); + System.out.println(InfoMsg.CALCULATION_MESSAGE.getInfoMsg()); + System.out.println(InfoMsg.EXIT_MESSAGE.getInfoMsg()); + } + + @Override + public void errorMsg(String msg) { + System.out.println(msg); + } + + @Override + public void selectMsg(String selectNum) { + System.out.println(InfoMsg.SELECT_NUM_MESSAGE.getInfoMsg() + selectNum); + } + + @Override + public void formulaMsg(String inputMsg) { + System.out.println(inputMsg); + } + + @Override + public void calculationValue(String value) { + System.out.println(value); + } + + @Override + public void getCalculationValues(Map values) { + for (Long key : values.keySet()) { + String value = values.get(key); + System.out.println(value); + } + } + + @Override + public void exitMsg() { + System.out.println(InfoMsg.EXIT_INFO_MESSAGE.getInfoMsg()); + } +} diff --git a/src/main/java/org/programmers/java/console/Input.java b/src/main/java/org/programmers/java/console/Input.java new file mode 100644 index 000000000..6687ca3bc --- /dev/null +++ b/src/main/java/org/programmers/java/console/Input.java @@ -0,0 +1,6 @@ +package org.programmers.java.console; + +public interface Input { + String numInput(); + String calculationInput(); +} diff --git a/src/main/java/org/programmers/java/console/Output.java b/src/main/java/org/programmers/java/console/Output.java new file mode 100644 index 000000000..9c3c990a5 --- /dev/null +++ b/src/main/java/org/programmers/java/console/Output.java @@ -0,0 +1,13 @@ +package org.programmers.java.console; + +import java.util.Map; + +public interface Output { + void menuMsg(); + void errorMsg(String msg); + void selectMsg(String selectNum); + void formulaMsg(String inputMsg); + void calculationValue(String value); + void getCalculationValues(Map Values); + void exitMsg(); +} diff --git a/src/main/java/org/programmers/java/message/ErrorMsg.java b/src/main/java/org/programmers/java/message/ErrorMsg.java new file mode 100644 index 000000000..e205cf23d --- /dev/null +++ b/src/main/java/org/programmers/java/message/ErrorMsg.java @@ -0,0 +1,15 @@ +package org.programmers.java.message; + +public enum ErrorMsg { + SELECT_VALIDATION_ERROR_MSG("잘못된 입력 값 입니다. 1-3 사이의 숫자를 선택해주세요"); + + private final String errorMsg; + + ErrorMsg(String errorMsg) { + this.errorMsg = errorMsg; + } + + public String getErrorMsg() { + return errorMsg; + } +} diff --git a/src/main/java/org/programmers/java/message/InfoMsg.java b/src/main/java/org/programmers/java/message/InfoMsg.java new file mode 100644 index 000000000..a11f8c850 --- /dev/null +++ b/src/main/java/org/programmers/java/message/InfoMsg.java @@ -0,0 +1,19 @@ +package org.programmers.java.message; + +public enum InfoMsg { + SELECT_MESSGAE("1. 조회"), + CALCULATION_MESSAGE("2. 계산"), + EXIT_MESSAGE("3. 종료"), + SELECT_NUM_MESSAGE("선택 : "), + EXIT_INFO_MESSAGE("프로그램이 종료되었습니다"); + + + private final String infoMsg; + InfoMsg(String infoMsg) { + this.infoMsg = infoMsg; + } + + public String getInfoMsg() { + return infoMsg; + } +} From 8ad98a3521f2baa503469e3edc6fb1eedd964f20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=99=A9=EC=B0=BD=ED=98=84?= Date: Sun, 4 Jun 2023 20:32:25 +0900 Subject: [PATCH 03/34] =?UTF-8?q?feat:=20=EC=97=B0=EC=82=B0=EC=8B=9D=20?= =?UTF-8?q?=EC=9E=85=EB=A0=A5=EA=B0=92=20=EA=B2=80=EC=A6=9D=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5,=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/programmers/java/App.java | 3 +- .../java/org/programmers/java/Calculator.java | 3 + .../org/programmers/java/console/Console.java | 9 ++- .../programmers/java/message/ErrorMsg.java | 1 + .../java/validation/Validation.java | 56 +++++++++++++++++++ .../java/org/programmers/java/Validaion.java | 43 ++++++++++++++ 6 files changed, 113 insertions(+), 2 deletions(-) create mode 100644 src/main/java/org/programmers/java/validation/Validation.java create mode 100644 src/test/java/org/programmers/java/Validaion.java diff --git a/src/main/java/org/programmers/java/App.java b/src/main/java/org/programmers/java/App.java index 31928036e..66f1cc813 100644 --- a/src/main/java/org/programmers/java/App.java +++ b/src/main/java/org/programmers/java/App.java @@ -1,10 +1,11 @@ package org.programmers.java; import org.programmers.java.console.Console; +import org.programmers.java.validation.Validation; public class App { public static void main(String[] args){ - Console console = new Console(); + Console console = new Console(new Validation()); Calculator calculator = new Calculator(console, console); calculator.run(); } diff --git a/src/main/java/org/programmers/java/Calculator.java b/src/main/java/org/programmers/java/Calculator.java index b4a98cbaf..f104df340 100644 --- a/src/main/java/org/programmers/java/Calculator.java +++ b/src/main/java/org/programmers/java/Calculator.java @@ -23,6 +23,9 @@ void run() { case "1": break; case "2": + String formula = input.calculationInput(); + if(formula.equals("")) break; + System.out.println("계산기 동작"); break; case "3": output.exitMsg(); diff --git a/src/main/java/org/programmers/java/console/Console.java b/src/main/java/org/programmers/java/console/Console.java index 487320485..b4cae32f6 100644 --- a/src/main/java/org/programmers/java/console/Console.java +++ b/src/main/java/org/programmers/java/console/Console.java @@ -1,13 +1,19 @@ package org.programmers.java.console; import org.programmers.java.message.InfoMsg; +import org.programmers.java.validation.Validation; import java.util.Map; import java.util.Scanner; public class Console implements Input, Output { + private Validation validation; private final Scanner scanner = new Scanner(System.in); + public Console(Validation validation) { + this.validation = validation; + } + @Override public String numInput() { String numInput = scanner.nextLine(); @@ -17,7 +23,8 @@ public String numInput() { @Override public String calculationInput() { String calculationInput = scanner.nextLine(); - return calculationInput; + Boolean validationCheck = validation.calculateValidation(calculationInput); + return validationCheck == true ? calculationInput : ""; } @Override diff --git a/src/main/java/org/programmers/java/message/ErrorMsg.java b/src/main/java/org/programmers/java/message/ErrorMsg.java index e205cf23d..ba8e9c2cb 100644 --- a/src/main/java/org/programmers/java/message/ErrorMsg.java +++ b/src/main/java/org/programmers/java/message/ErrorMsg.java @@ -1,6 +1,7 @@ package org.programmers.java.message; public enum ErrorMsg { + CALCULATE_VALIDATION_ERROR_MSG("잘못된 입력 값 입니다. 형식을 맞춰주세요. ex) 2 + 4 ..."), SELECT_VALIDATION_ERROR_MSG("잘못된 입력 값 입니다. 1-3 사이의 숫자를 선택해주세요"); private final String errorMsg; diff --git a/src/main/java/org/programmers/java/validation/Validation.java b/src/main/java/org/programmers/java/validation/Validation.java new file mode 100644 index 000000000..038938ba2 --- /dev/null +++ b/src/main/java/org/programmers/java/validation/Validation.java @@ -0,0 +1,56 @@ +package org.programmers.java.validation; + +import org.programmers.java.message.ErrorMsg; + +import java.util.ArrayList; +import java.util.List; + +public class Validation { + private final String numberMatch = "[0-9]+"; + private final String operatorMatch = "[*+/-]"; + + + // 연산식 검증 로직 + public boolean calculateValidation(String inputMsg) { + Boolean afterCheck = false; + + List formulaList = formulaSplitValidation(inputMsg); + + if(formulaList.size() != 0) afterCheck = checkFormulaValidation(formulaList); + + if(!afterCheck) System.out.println(ErrorMsg.CALCULATE_VALIDATION_ERROR_MSG.getErrorMsg()); + + return afterCheck; + } + + + // 연산식 검증: 연산식 분해 후 하나씩 검증 + public List formulaSplitValidation(String inputMsg){ + String[] splitMsg = inputMsg.split(" "); + List formulaBeforeValidation = new ArrayList<>(); + + for(String str : splitMsg){ + if(str.matches(numberMatch)) formulaBeforeValidation.add(str); + else if(str.matches(operatorMatch)) formulaBeforeValidation.add(str); + else { + System.out.println(ErrorMsg.CALCULATE_VALIDATION_ERROR_MSG.getErrorMsg()); + formulaBeforeValidation.clear(); + break; + } + } + return formulaBeforeValidation; + } + + + // 연산식 검증: 연산자와 피연산자의 전체 개수 검증 및 위치 검증 + public Boolean checkFormulaValidation(List formulaList){ + if(formulaList.size() % 2 == 0) return false; + + for(int i=0; i < formulaList.size(); i++){ + if(i % 2 == 0 && !formulaList.get(i).matches(numberMatch)) return false; + if(i % 2 == 1 && !formulaList.get(i).matches(operatorMatch)) return false; + } + + return true; + } +} diff --git a/src/test/java/org/programmers/java/Validaion.java b/src/test/java/org/programmers/java/Validaion.java new file mode 100644 index 000000000..a6e464c35 --- /dev/null +++ b/src/test/java/org/programmers/java/Validaion.java @@ -0,0 +1,43 @@ +package org.programmers.java; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.programmers.java.validation.Validation; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + + +public class Validaion { + + Validation validation = new Validation(); + + @Test + @DisplayName("연산식 검증: 연산식 분해 검증") + void formulaSplitValidation(){ + // given + String inputMsg = "10 + 4 / 20 * 3 - 2"; + List formulaTest = Arrays.asList("10", "+", "4", "/", "20", "*", "3", "-", "2"); + + // when + List formulaList = validation.formulaSplitValidation(inputMsg); + + // then + Assertions.assertEquals(formulaList, formulaTest); + } + + @Test + @DisplayName("연산식 검증: 연산자와 피연산자의 전체 개수 검증 및 위치 검증") + void checkFormulaValidation(){ + // given + List formulaList = Arrays.asList("10", "+", "4", "/", "20", "*", "3", "-", "2"); + + // when + Boolean checkedFormulaValidation = validation.checkFormulaValidation(formulaList); + + // then + Assertions.assertEquals(checkedFormulaValidation, true); + } +} From 23dc0a51d03da53727bc31362c3de6c53dc59cc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=99=A9=EC=B0=BD=ED=98=84?= Date: Tue, 6 Jun 2023 19:31:22 +0900 Subject: [PATCH 04/34] =?UTF-8?q?feat:=20=EC=97=B0=EC=82=B0=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EA=B5=AC=ED=98=84=20=EB=B0=8F=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/programmers/java/App.java | 4 +- .../java/org/programmers/java/Calculator.java | 8 +- .../programmers/java/calculate/Calculate.java | 85 +++++++++++++++++++ .../programmers/java/calculate/Operator.java | 20 +++++ .../org/programmers/java/CalculateTest.java | 45 ++++++++++ .../org/programmers/java/OperatorTest.java | 18 ++++ .../{Validaion.java => ValidaionTest.java} | 3 +- 7 files changed, 178 insertions(+), 5 deletions(-) create mode 100644 src/main/java/org/programmers/java/calculate/Calculate.java create mode 100644 src/main/java/org/programmers/java/calculate/Operator.java create mode 100644 src/test/java/org/programmers/java/CalculateTest.java create mode 100644 src/test/java/org/programmers/java/OperatorTest.java rename src/test/java/org/programmers/java/{Validaion.java => ValidaionTest.java} (95%) diff --git a/src/main/java/org/programmers/java/App.java b/src/main/java/org/programmers/java/App.java index 66f1cc813..5b979a450 100644 --- a/src/main/java/org/programmers/java/App.java +++ b/src/main/java/org/programmers/java/App.java @@ -1,12 +1,14 @@ package org.programmers.java; +import org.programmers.java.calculate.Calculate; import org.programmers.java.console.Console; import org.programmers.java.validation.Validation; public class App { public static void main(String[] args){ Console console = new Console(new Validation()); - Calculator calculator = new Calculator(console, console); + Calculate calculate = new Calculate(); + Calculator calculator = new Calculator(console, console, calculate); calculator.run(); } } diff --git a/src/main/java/org/programmers/java/Calculator.java b/src/main/java/org/programmers/java/Calculator.java index f104df340..6543b5481 100644 --- a/src/main/java/org/programmers/java/Calculator.java +++ b/src/main/java/org/programmers/java/Calculator.java @@ -1,5 +1,6 @@ package org.programmers.java; +import org.programmers.java.calculate.Calculate; import org.programmers.java.console.Input; import org.programmers.java.console.Output; import org.programmers.java.message.ErrorMsg; @@ -8,10 +9,12 @@ public class Calculator { private boolean exitStatus = true; private Input input; private Output output; + private Calculate calculate; - Calculator(Input input, Output output){ + Calculator(Input input, Output output, Calculate calculate){ this.input = input; this.output = output; + this.calculate = calculate; } void run() { @@ -25,7 +28,8 @@ void run() { case "2": String formula = input.calculationInput(); if(formula.equals("")) break; - System.out.println("계산기 동작"); + String result = calculate.requestCalculate(formula); + output.calculationValue(result); break; case "3": output.exitMsg(); diff --git a/src/main/java/org/programmers/java/calculate/Calculate.java b/src/main/java/org/programmers/java/calculate/Calculate.java new file mode 100644 index 000000000..a56270fac --- /dev/null +++ b/src/main/java/org/programmers/java/calculate/Calculate.java @@ -0,0 +1,85 @@ +package org.programmers.java.calculate; + +import java.util.*; + +public class Calculate { + + private final String numberMatch = "[0-9]+"; + private final String operatorMatch = "[*+/-]"; + private final Map operatorPriority = Map.of( + "+", 1, + "-", 1, + "*", 2, + "/", 2 + ); + + // 연산 요청 후 연산 작업 로직 + public String requestCalculate(String inputFormula){ + String[] formulaList = inputFormula.split(" "); + List postfixOperator = infixToPostfix(formulaList); + String result = postfixCalculate(postfixOperator); + return result; + } + + // 중위 -> 후위 + public List infixToPostfix(String[] formulaList){ + + List postfixOperator = new ArrayList<>(); + Deque operatorDeque = new ArrayDeque<>(); + + for(String item : formulaList){ + if(item.matches(numberMatch)){ + postfixOperator.add(item); + } + if(item.matches(operatorMatch)){ + if(operatorDeque.size() == 0) operatorDeque.add(item); + else { + while(operatorDeque.size() > 0){ + if(operatorPriority.get(operatorDeque.peekLast()) <= operatorPriority.get(item)) { + operatorDeque.add(item); + break; + } + else postfixOperator.add(operatorDeque.removeLast()); + } + if(operatorDeque.size() == 0) operatorDeque.add(item); + } + } + } + + while(operatorDeque.size() > 0){ + postfixOperator.add(operatorDeque.removeLast()); + } + + + return postfixOperator; + } + + + // 후위 -> 연산 + public String postfixCalculate(List postfixOperator){ + Deque numberDeque = new ArrayDeque<>(); + for(String item : postfixOperator){ + if(item.matches(numberMatch)) numberDeque.add(item); + if(item.matches(operatorMatch)){ + int num2 = Integer.parseInt(numberDeque.removeLast()); + int num1 = Integer.parseInt(numberDeque.removeLast()); + + switch (item){ + case "+": + numberDeque.add(String.valueOf(Operator.plus(num1, num2))); + break; + case "-": + numberDeque.add(String.valueOf(Operator.minus(num1, num2))); + break; + case "*": + numberDeque.add(String.valueOf(Operator.multiply(num1, num2))); + break; + case "/": + numberDeque.add(String.valueOf(Operator.divide(num1, num2))); + break; + } + } + } + return numberDeque.removeLast(); + } +} diff --git a/src/main/java/org/programmers/java/calculate/Operator.java b/src/main/java/org/programmers/java/calculate/Operator.java new file mode 100644 index 000000000..46dc4e89b --- /dev/null +++ b/src/main/java/org/programmers/java/calculate/Operator.java @@ -0,0 +1,20 @@ +package org.programmers.java.calculate; + +import java.util.function.BiFunction; + +public class Operator { + + static public int plus(int a, int b){ + return a + b; + } + static public int minus(int a, int b){ + return a - b; + } + static public int multiply(int a, int b){ + return a * b; + } + static public int divide(int a, int b){ + if(b == 0) throw new ArithmeticException("0으로 나눌 수 없습니다."); + return a / b; + } +} diff --git a/src/test/java/org/programmers/java/CalculateTest.java b/src/test/java/org/programmers/java/CalculateTest.java new file mode 100644 index 000000000..63c92a2a3 --- /dev/null +++ b/src/test/java/org/programmers/java/CalculateTest.java @@ -0,0 +1,45 @@ +package org.programmers.java; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; +import org.programmers.java.calculate.Calculate; + +import java.util.Arrays; +import java.util.List; + +public class CalculateTest { + + Calculate calculate = new Calculate(); + + @Test + @DisplayName("중위 표기식 -> 후위 표기식 변경") + void infixToPostfix(){ + // given + String[] formulaList = {"3", "+", "5", "*", "10"}; + List postfixExpect = Arrays.asList("3","5","10","*","+"); + + // when + List postfix = calculate.infixToPostfix(formulaList); + + // then + Assertions.assertEquals(postfixExpect, postfix); + } + + @Test + @DisplayName("후위 표기식으로 연산하기") + void postfixCalculate(){ + // given + List postfix = Arrays.asList("3","5","10","*","+"); + + // when + String calculateValue = calculate.postfixCalculate(postfix); + + // then + Assertions.assertEquals("53", calculateValue); + } + + +} diff --git a/src/test/java/org/programmers/java/OperatorTest.java b/src/test/java/org/programmers/java/OperatorTest.java new file mode 100644 index 000000000..87b6ec394 --- /dev/null +++ b/src/test/java/org/programmers/java/OperatorTest.java @@ -0,0 +1,18 @@ +package org.programmers.java; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.programmers.java.calculate.Operator; + +public class OperatorTest { + + @Test + @DisplayName("사칙연산 테스트") + void operatorCalculate(){ + Assertions.assertEquals(10, Operator.plus(5, 5)); + Assertions.assertEquals(3, Operator.minus(5, 2)); + Assertions.assertEquals(30, Operator.multiply(10, 3)); + Assertions.assertEquals(5, Operator.divide(40, 8)); + } +} diff --git a/src/test/java/org/programmers/java/Validaion.java b/src/test/java/org/programmers/java/ValidaionTest.java similarity index 95% rename from src/test/java/org/programmers/java/Validaion.java rename to src/test/java/org/programmers/java/ValidaionTest.java index a6e464c35..a46f5d2fe 100644 --- a/src/test/java/org/programmers/java/Validaion.java +++ b/src/test/java/org/programmers/java/ValidaionTest.java @@ -5,12 +5,11 @@ import org.junit.jupiter.api.Test; import org.programmers.java.validation.Validation; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; -public class Validaion { +public class ValidaionTest { Validation validation = new Validation(); From efbb334221010669f480576129c89f2cdb233357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=99=A9=EC=B0=BD=ED=98=84?= Date: Tue, 6 Jun 2023 19:33:42 +0900 Subject: [PATCH 05/34] =?UTF-8?q?refactor:=20=EB=B3=80=ED=95=98=EC=A7=80?= =?UTF-8?q?=20=EC=95=8A=EB=8A=94=20=EC=83=81=EC=88=98=EA=B0=92=20final?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD,=20return=20=EA=B0=92=20wrapper?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EA=B8=B0=EB=B3=B8=20=ED=83=80=EC=9E=85?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/programmers/java/Calculator.java | 6 +++--- src/main/java/org/programmers/java/console/Console.java | 2 +- .../java/org/programmers/java/validation/Validation.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/programmers/java/Calculator.java b/src/main/java/org/programmers/java/Calculator.java index 6543b5481..96e45e95b 100644 --- a/src/main/java/org/programmers/java/Calculator.java +++ b/src/main/java/org/programmers/java/Calculator.java @@ -7,9 +7,9 @@ public class Calculator { private boolean exitStatus = true; - private Input input; - private Output output; - private Calculate calculate; + private final Input input; + private final Output output; + private final Calculate calculate; Calculator(Input input, Output output, Calculate calculate){ this.input = input; diff --git a/src/main/java/org/programmers/java/console/Console.java b/src/main/java/org/programmers/java/console/Console.java index b4cae32f6..789d9e946 100644 --- a/src/main/java/org/programmers/java/console/Console.java +++ b/src/main/java/org/programmers/java/console/Console.java @@ -7,7 +7,7 @@ import java.util.Scanner; public class Console implements Input, Output { - private Validation validation; + private final Validation validation; private final Scanner scanner = new Scanner(System.in); public Console(Validation validation) { diff --git a/src/main/java/org/programmers/java/validation/Validation.java b/src/main/java/org/programmers/java/validation/Validation.java index 038938ba2..27d9af890 100644 --- a/src/main/java/org/programmers/java/validation/Validation.java +++ b/src/main/java/org/programmers/java/validation/Validation.java @@ -43,7 +43,7 @@ public List formulaSplitValidation(String inputMsg){ // 연산식 검증: 연산자와 피연산자의 전체 개수 검증 및 위치 검증 - public Boolean checkFormulaValidation(List formulaList){ + public boolean checkFormulaValidation(List formulaList){ if(formulaList.size() % 2 == 0) return false; for(int i=0; i < formulaList.size(); i++){ From f0f58f41f11267c30c9fbdb08e42662d04166ad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=99=A9=EC=B0=BD=ED=98=84?= Date: Tue, 6 Jun 2023 20:44:57 +0900 Subject: [PATCH 06/34] =?UTF-8?q?=EC=97=B0=EC=82=B0=EC=8B=9D=20=EB=B0=8F?= =?UTF-8?q?=20=EC=97=B0=EC=82=B0=EA=B2=B0=EA=B3=BC=20=EC=A0=80=EC=9E=A5?= =?UTF-8?q?=EC=86=8C=EC=97=90=20=EC=A0=80=EC=9E=A5=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84=20=EB=B0=8F=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/programmers/java/App.java | 5 +- .../java/org/programmers/java/Calculator.java | 7 ++- .../repository/FormulaMemoryRepository.java | 24 +++++++++ .../java/repository/FormulaRepository.java | 9 ++++ .../org/programmers/java/RepositoryTest.java | 50 +++++++++++++++++++ 5 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 src/main/java/org/programmers/java/repository/FormulaMemoryRepository.java create mode 100644 src/main/java/org/programmers/java/repository/FormulaRepository.java create mode 100644 src/test/java/org/programmers/java/RepositoryTest.java diff --git a/src/main/java/org/programmers/java/App.java b/src/main/java/org/programmers/java/App.java index 5b979a450..cd6d3d3a2 100644 --- a/src/main/java/org/programmers/java/App.java +++ b/src/main/java/org/programmers/java/App.java @@ -2,13 +2,16 @@ import org.programmers.java.calculate.Calculate; import org.programmers.java.console.Console; +import org.programmers.java.repository.FormulaRepository; +import org.programmers.java.repository.FormulaMemoryRepository; import org.programmers.java.validation.Validation; public class App { public static void main(String[] args){ Console console = new Console(new Validation()); Calculate calculate = new Calculate(); - Calculator calculator = new Calculator(console, console, calculate); + FormulaRepository formulaRepository = new FormulaMemoryRepository(); + Calculator calculator = new Calculator(console, console, calculate, formulaRepository); calculator.run(); } } diff --git a/src/main/java/org/programmers/java/Calculator.java b/src/main/java/org/programmers/java/Calculator.java index 96e45e95b..d6fb83949 100644 --- a/src/main/java/org/programmers/java/Calculator.java +++ b/src/main/java/org/programmers/java/Calculator.java @@ -4,17 +4,20 @@ import org.programmers.java.console.Input; import org.programmers.java.console.Output; import org.programmers.java.message.ErrorMsg; +import org.programmers.java.repository.FormulaRepository; public class Calculator { private boolean exitStatus = true; private final Input input; private final Output output; private final Calculate calculate; + private final FormulaRepository formulaRepository; - Calculator(Input input, Output output, Calculate calculate){ + Calculator(Input input, Output output, Calculate calculate, FormulaRepository formulaRepository){ this.input = input; this.output = output; this.calculate = calculate; + this.formulaRepository = formulaRepository; } void run() { @@ -24,12 +27,14 @@ void run() { output.selectMsg(inputNum); switch (inputNum) { case "1": + output.getCalculationValues(formulaRepository.getFormulaList()); break; case "2": String formula = input.calculationInput(); if(formula.equals("")) break; String result = calculate.requestCalculate(formula); output.calculationValue(result); + formulaRepository.save(formula, result); break; case "3": output.exitMsg(); diff --git a/src/main/java/org/programmers/java/repository/FormulaMemoryRepository.java b/src/main/java/org/programmers/java/repository/FormulaMemoryRepository.java new file mode 100644 index 000000000..5580604f2 --- /dev/null +++ b/src/main/java/org/programmers/java/repository/FormulaMemoryRepository.java @@ -0,0 +1,24 @@ +package org.programmers.java.repository; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +public class FormulaMemoryRepository implements FormulaRepository { + Map formulaMap = new HashMap<>(); + private Long num = 0L; + + @Override + public void save(String formula, String caculateValue) { + StringBuilder stringBuilder = new StringBuilder(formula); + stringBuilder.append(" = "); + stringBuilder.append(caculateValue); + formulaMap.put(num++, stringBuilder.toString()); + } + + @Override + public Map getFormulaList() { + return formulaMap; + } +} diff --git a/src/main/java/org/programmers/java/repository/FormulaRepository.java b/src/main/java/org/programmers/java/repository/FormulaRepository.java new file mode 100644 index 000000000..49777efc6 --- /dev/null +++ b/src/main/java/org/programmers/java/repository/FormulaRepository.java @@ -0,0 +1,9 @@ +package org.programmers.java.repository; + +import java.util.List; +import java.util.Map; + +public interface FormulaRepository { + void save(String formula, String caculateValue); + Map getFormulaList(); +} diff --git a/src/test/java/org/programmers/java/RepositoryTest.java b/src/test/java/org/programmers/java/RepositoryTest.java new file mode 100644 index 000000000..8f1a0d472 --- /dev/null +++ b/src/test/java/org/programmers/java/RepositoryTest.java @@ -0,0 +1,50 @@ +package org.programmers.java; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.programmers.java.repository.FormulaMemoryRepository; +import org.programmers.java.repository.FormulaRepository; + +import java.util.Map; + +public class RepositoryTest { + + FormulaRepository formulaRepository = new FormulaMemoryRepository(); + + @Test + @DisplayName("연산식과 결과 저장소에 저장") + void save(){ + // given + String formula = "3 + 6 / 2"; + String result = "6"; + + // when + formulaRepository.save(formula, result); + + // then + Assertions.assertEquals(formula + " = " + result, formulaRepository.getFormulaList().get(0L)); + } + + @Test + @DisplayName("연산식, 결과 모두 출력하기") + void getFormulaList(){ + // given + String formula1 = "3 + 6 / 2"; + String result1 = "6"; + String formula2 = "10 / 2 * 5 - 3"; + String result2 = "22"; + + Map formulaListExpect = Map.of( + 0L, "3 + 6 / 2 = 6", + 1L, "10 / 2 * 5 - 3 = 22" + ); + + // when + formulaRepository.save(formula1, result1); + formulaRepository.save(formula2, result2); + + // then + Assertions.assertEquals(formulaListExpect, formulaRepository.getFormulaList()); + } +} From 46c8ed6033026724314b03b621aba23370407079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=99=A9=EC=B0=BD=ED=98=84?= Date: Tue, 6 Jun 2023 20:47:48 +0900 Subject: [PATCH 07/34] =?UTF-8?q?refactor:=20console=EC=97=90=EC=84=9C?= =?UTF-8?q?=EC=9D=98=20sysout=EC=9D=84=20output=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=ED=95=98=EC=97=AC=20=20=EB=B6=84=EB=A6=AC?= =?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/programmers/java/Calculator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/programmers/java/Calculator.java b/src/main/java/org/programmers/java/Calculator.java index d6fb83949..fe1505e2c 100644 --- a/src/main/java/org/programmers/java/Calculator.java +++ b/src/main/java/org/programmers/java/Calculator.java @@ -41,7 +41,7 @@ void run() { exitStatus = false; break; default: - System.out.println(ErrorMsg.SELECT_VALIDATION_ERROR_MSG.getErrorMsg()); + output.errorMsg(ErrorMsg.SELECT_VALIDATION_ERROR_MSG.getErrorMsg()); } } } From 6a7725889a9d2c4210e07416670e7788ce935fc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=99=A9=EC=B0=BD=ED=98=84?= Date: Tue, 6 Jun 2023 20:55:56 +0900 Subject: [PATCH 08/34] =?UTF-8?q?chore:=20=EB=B6=88=ED=95=84=EC=9A=94=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=82=AD=EC=A0=9C,=20gitignore=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 + .idea/.gitignore | 8 - .idea/compiler.xml | 6 - .idea/jarRepositories.xml | 20 -- .idea/misc.xml | 10 - .idea/vcs.xml | 6 - gradle/wrapper/gradle-wrapper.jar | Bin 60756 -> 0 bytes gradle/wrapper/gradle-wrapper.properties | 6 - gradlew | 234 ----------------------- gradlew.bat | 89 --------- 10 files changed, 3 insertions(+), 379 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/vcs.xml delete mode 100644 gradle/wrapper/gradle-wrapper.jar delete mode 100644 gradle/wrapper/gradle-wrapper.properties delete mode 100755 gradlew delete mode 100644 gradlew.bat diff --git a/.gitignore b/.gitignore index 73281d9dc..a457a6316 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,9 @@ # *.iml # *.ipr +.idea + + # CMake cmake-build-*/ diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b81b..000000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index fb7f4a8a4..000000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index fdc392fe8..000000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 5d9825616..000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1ddfb..000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 249e5832f090a2944b7473328c07c9755baa3196..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 60756 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 '} - 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 deleted file mode 100644 index ac1b06f93..000000000 --- a/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@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 From 49d396731da47bf2256615ad012655b7e6fb12a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=99=A9=EC=B0=BD=ED=98=84?= Date: Tue, 6 Jun 2023 23:14:36 +0900 Subject: [PATCH 09/34] =?UTF-8?q?chore:=20gitignore=20gradle=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=ED=8C=8C=EC=9D=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a457a6316..8377beb81 100644 --- a/.gitignore +++ b/.gitignore @@ -45,7 +45,9 @@ # *.ipr .idea - +gradle +gradlew +gradlew.bat # CMake cmake-build-*/ From 633856b9378613164f43afeec3b3821df5e864a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=99=A9=EC=B0=BD=ED=98=84?= Date: Sat, 10 Jun 2023 15:24:36 +0900 Subject: [PATCH 10/34] =?UTF-8?q?refactor:=20Console=EC=97=90=EC=84=9C=20V?= =?UTF-8?q?alidation=20=EC=9D=98=EC=A1=B4=EC=84=B1=20=EB=B6=84=EB=A6=AC,?= =?UTF-8?q?=20Console=20=EC=8B=B1=EA=B8=80=ED=86=A4=20=EA=B5=AC=ED=98=84,?= =?UTF-8?q?=20=EC=97=90=EB=9F=AC=EB=A9=94=EC=8B=9C=EC=A7=80=20Console?= =?UTF-8?q?=EB=A1=9C=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/programmers/java/App.java | 5 +++-- .../java/org/programmers/java/Calculator.java | 21 +++++++++++++------ .../org/programmers/java/console/Console.java | 16 +++++++++----- .../java/validation/Validation.java | 10 +++++++-- .../org/programmers/java/ValidaionTest.java | 4 +++- 5 files changed, 40 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/programmers/java/App.java b/src/main/java/org/programmers/java/App.java index cd6d3d3a2..002cbcd90 100644 --- a/src/main/java/org/programmers/java/App.java +++ b/src/main/java/org/programmers/java/App.java @@ -8,10 +8,11 @@ public class App { public static void main(String[] args){ - Console console = new Console(new Validation()); + Console console = Console.getInstance(); Calculate calculate = new Calculate(); FormulaRepository formulaRepository = new FormulaMemoryRepository(); - Calculator calculator = new Calculator(console, console, calculate, formulaRepository); + Validation validation = new Validation(console); + Calculator calculator = new Calculator(console, console, calculate, formulaRepository, validation); calculator.run(); } } diff --git a/src/main/java/org/programmers/java/Calculator.java b/src/main/java/org/programmers/java/Calculator.java index fe1505e2c..013d20fe9 100644 --- a/src/main/java/org/programmers/java/Calculator.java +++ b/src/main/java/org/programmers/java/Calculator.java @@ -5,6 +5,7 @@ import org.programmers.java.console.Output; import org.programmers.java.message.ErrorMsg; import org.programmers.java.repository.FormulaRepository; +import org.programmers.java.validation.Validation; public class Calculator { private boolean exitStatus = true; @@ -12,12 +13,14 @@ public class Calculator { private final Output output; private final Calculate calculate; private final FormulaRepository formulaRepository; + private final Validation validation; - Calculator(Input input, Output output, Calculate calculate, FormulaRepository formulaRepository){ + Calculator(Input input, Output output, Calculate calculate, FormulaRepository formulaRepository, Validation validation){ this.input = input; this.output = output; this.calculate = calculate; this.formulaRepository = formulaRepository; + this.validation = validation; } void run() { @@ -30,11 +33,7 @@ void run() { output.getCalculationValues(formulaRepository.getFormulaList()); break; case "2": - String formula = input.calculationInput(); - if(formula.equals("")) break; - String result = calculate.requestCalculate(formula); - output.calculationValue(result); - formulaRepository.save(formula, result); + formulaCalculate(); break; case "3": output.exitMsg(); @@ -45,4 +44,14 @@ void run() { } } } + + private void formulaCalculate() { + String formula = input.calculationInput(); + + if(validation.calculateValidation(formula)){ + String result = calculate.requestCalculate(formula); + output.calculationValue(result); + formulaRepository.save(formula, result); + } + } } diff --git a/src/main/java/org/programmers/java/console/Console.java b/src/main/java/org/programmers/java/console/Console.java index 789d9e946..59458034c 100644 --- a/src/main/java/org/programmers/java/console/Console.java +++ b/src/main/java/org/programmers/java/console/Console.java @@ -7,13 +7,20 @@ import java.util.Scanner; public class Console implements Input, Output { - private final Validation validation; + private final Scanner scanner = new Scanner(System.in); - public Console(Validation validation) { - this.validation = validation; + private Console() {} + + private static class ConsoleSingleton { + private static final Console consoleInstance = new Console(); } + public static Console getInstance(){ + return ConsoleSingleton.consoleInstance; + } + + @Override public String numInput() { String numInput = scanner.nextLine(); @@ -23,8 +30,7 @@ public String numInput() { @Override public String calculationInput() { String calculationInput = scanner.nextLine(); - Boolean validationCheck = validation.calculateValidation(calculationInput); - return validationCheck == true ? calculationInput : ""; + return calculationInput; } @Override diff --git a/src/main/java/org/programmers/java/validation/Validation.java b/src/main/java/org/programmers/java/validation/Validation.java index 27d9af890..3a7c73932 100644 --- a/src/main/java/org/programmers/java/validation/Validation.java +++ b/src/main/java/org/programmers/java/validation/Validation.java @@ -1,15 +1,21 @@ package org.programmers.java.validation; +import org.programmers.java.console.Output; import org.programmers.java.message.ErrorMsg; import java.util.ArrayList; import java.util.List; public class Validation { + private final Output output; private final String numberMatch = "[0-9]+"; private final String operatorMatch = "[*+/-]"; + public Validation(Output output) { + this.output = output; + } + // 연산식 검증 로직 public boolean calculateValidation(String inputMsg) { Boolean afterCheck = false; @@ -18,7 +24,7 @@ public boolean calculateValidation(String inputMsg) { if(formulaList.size() != 0) afterCheck = checkFormulaValidation(formulaList); - if(!afterCheck) System.out.println(ErrorMsg.CALCULATE_VALIDATION_ERROR_MSG.getErrorMsg()); + if(!afterCheck) output.errorMsg(ErrorMsg.CALCULATE_VALIDATION_ERROR_MSG.getErrorMsg()); return afterCheck; } @@ -33,7 +39,7 @@ public List formulaSplitValidation(String inputMsg){ if(str.matches(numberMatch)) formulaBeforeValidation.add(str); else if(str.matches(operatorMatch)) formulaBeforeValidation.add(str); else { - System.out.println(ErrorMsg.CALCULATE_VALIDATION_ERROR_MSG.getErrorMsg()); + output.errorMsg(ErrorMsg.CALCULATE_VALIDATION_ERROR_MSG.getErrorMsg()); formulaBeforeValidation.clear(); break; } diff --git a/src/test/java/org/programmers/java/ValidaionTest.java b/src/test/java/org/programmers/java/ValidaionTest.java index a46f5d2fe..e5232a989 100644 --- a/src/test/java/org/programmers/java/ValidaionTest.java +++ b/src/test/java/org/programmers/java/ValidaionTest.java @@ -3,6 +3,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.programmers.java.console.Console; +import org.programmers.java.console.Output; import org.programmers.java.validation.Validation; import java.util.Arrays; @@ -11,7 +13,7 @@ public class ValidaionTest { - Validation validation = new Validation(); + Validation validation = new Validation(Console.getInstance()); @Test @DisplayName("연산식 검증: 연산식 분해 검증") From 52acb08837b7ce68ad6aed3c4c88bbae33e54676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=99=A9=EC=B0=BD=ED=98=84?= Date: Sat, 10 Jun 2023 21:00:05 +0900 Subject: [PATCH 11/34] =?UTF-8?q?refactor:=20=EB=84=A4=EC=9D=B4=EB=B0=8D?= =?UTF-8?q?=20=EC=A0=84=EC=B2=B4=20=EC=88=98=EC=A0=95,=20else/else=20if=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EC=B2=98=EB=A6=AC,=20if=EB=AC=B8=20?= =?UTF-8?q?=EC=A4=91=EA=B4=84=ED=98=B8=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/programmers/java/App.java | 10 +-- .../java/org/programmers/java/Calculator.java | 30 +++---- .../Calculation.java} | 21 +++-- .../{calculate => calculation}/Operator.java | 8 +- .../org/programmers/java/console/Console.java | 28 +++---- .../org/programmers/java/console/Input.java | 4 +- .../org/programmers/java/message/Error.java | 16 ++++ .../programmers/java/message/ErrorMsg.java | 16 ---- .../org/programmers/java/message/Info.java | 19 +++++ .../org/programmers/java/message/InfoMsg.java | 19 ----- .../java/validation/Validation.java | 62 -------------- .../programmers/java/validator/Validator.java | 81 +++++++++++++++++++ ...alculateTest.java => CalculationTest.java} | 12 ++- .../org/programmers/java/OperatorTest.java | 2 +- .../org/programmers/java/ValidaionTest.java | 9 +-- 15 files changed, 179 insertions(+), 158 deletions(-) rename src/main/java/org/programmers/java/{calculate/Calculate.java => calculation/Calculation.java} (82%) rename src/main/java/org/programmers/java/{calculate => calculation}/Operator.java (65%) create mode 100644 src/main/java/org/programmers/java/message/Error.java delete mode 100644 src/main/java/org/programmers/java/message/ErrorMsg.java create mode 100644 src/main/java/org/programmers/java/message/Info.java delete mode 100644 src/main/java/org/programmers/java/message/InfoMsg.java delete mode 100644 src/main/java/org/programmers/java/validation/Validation.java create mode 100644 src/main/java/org/programmers/java/validator/Validator.java rename src/test/java/org/programmers/java/{CalculateTest.java => CalculationTest.java} (70%) diff --git a/src/main/java/org/programmers/java/App.java b/src/main/java/org/programmers/java/App.java index 002cbcd90..c016a907a 100644 --- a/src/main/java/org/programmers/java/App.java +++ b/src/main/java/org/programmers/java/App.java @@ -1,18 +1,18 @@ package org.programmers.java; -import org.programmers.java.calculate.Calculate; +import org.programmers.java.calculation.Calculation; import org.programmers.java.console.Console; import org.programmers.java.repository.FormulaRepository; import org.programmers.java.repository.FormulaMemoryRepository; -import org.programmers.java.validation.Validation; +import org.programmers.java.validator.Validator; public class App { public static void main(String[] args){ Console console = Console.getInstance(); - Calculate calculate = new Calculate(); + Calculation calculation = new Calculation(); FormulaRepository formulaRepository = new FormulaMemoryRepository(); - Validation validation = new Validation(console); - Calculator calculator = new Calculator(console, console, calculate, formulaRepository, validation); + Validator validator = new Validator(console); + Calculator calculator = new Calculator(console, console, calculation, formulaRepository, validator); calculator.run(); } } diff --git a/src/main/java/org/programmers/java/Calculator.java b/src/main/java/org/programmers/java/Calculator.java index 013d20fe9..f43ce1cb0 100644 --- a/src/main/java/org/programmers/java/Calculator.java +++ b/src/main/java/org/programmers/java/Calculator.java @@ -1,34 +1,34 @@ package org.programmers.java; -import org.programmers.java.calculate.Calculate; +import org.programmers.java.calculation.Calculation; import org.programmers.java.console.Input; import org.programmers.java.console.Output; -import org.programmers.java.message.ErrorMsg; +import org.programmers.java.message.Error; import org.programmers.java.repository.FormulaRepository; -import org.programmers.java.validation.Validation; +import org.programmers.java.validator.Validator; public class Calculator { private boolean exitStatus = true; private final Input input; private final Output output; - private final Calculate calculate; + private final Calculation calculation; private final FormulaRepository formulaRepository; - private final Validation validation; + private final Validator validator; - Calculator(Input input, Output output, Calculate calculate, FormulaRepository formulaRepository, Validation validation){ + Calculator(Input input, Output output, Calculation calculation, FormulaRepository formulaRepository, Validator validator){ this.input = input; this.output = output; - this.calculate = calculate; + this.calculation = calculation; this.formulaRepository = formulaRepository; - this.validation = validation; + this.validator = validator; } void run() { while (exitStatus) { output.menuMsg(); - String inputNum = input.numInput(); - output.selectMsg(inputNum); - switch (inputNum) { + String selectNum = input.selectNumInput(); + output.selectMsg(selectNum); + switch (selectNum) { case "1": output.getCalculationValues(formulaRepository.getFormulaList()); break; @@ -40,16 +40,16 @@ void run() { exitStatus = false; break; default: - output.errorMsg(ErrorMsg.SELECT_VALIDATION_ERROR_MSG.getErrorMsg()); + output.errorMsg(Error.SELECT_VALIDATION.getMsg()); } } } private void formulaCalculate() { - String formula = input.calculationInput(); + String formula = input.formulaInput(); - if(validation.calculateValidation(formula)){ - String result = calculate.requestCalculate(formula); + if(validator.formulaValidate(formula)){ + String result = calculation.requestCalculate(formula); output.calculationValue(result); formulaRepository.save(formula, result); } diff --git a/src/main/java/org/programmers/java/calculate/Calculate.java b/src/main/java/org/programmers/java/calculation/Calculation.java similarity index 82% rename from src/main/java/org/programmers/java/calculate/Calculate.java rename to src/main/java/org/programmers/java/calculation/Calculation.java index a56270fac..8a1e8bdaa 100644 --- a/src/main/java/org/programmers/java/calculate/Calculate.java +++ b/src/main/java/org/programmers/java/calculation/Calculation.java @@ -1,8 +1,8 @@ -package org.programmers.java.calculate; +package org.programmers.java.calculation; import java.util.*; -public class Calculate { +public class Calculation { private final String numberMatch = "[0-9]+"; private final String operatorMatch = "[*+/-]"; @@ -32,16 +32,21 @@ public List infixToPostfix(String[] formulaList){ postfixOperator.add(item); } if(item.matches(operatorMatch)){ - if(operatorDeque.size() == 0) operatorDeque.add(item); - else { + if(operatorDeque.size() == 0) { + operatorDeque.add(item); + continue; + } + if(operatorDeque.size() != 0){ while(operatorDeque.size() > 0){ if(operatorPriority.get(operatorDeque.peekLast()) <= operatorPriority.get(item)) { operatorDeque.add(item); break; } - else postfixOperator.add(operatorDeque.removeLast()); + postfixOperator.add(operatorDeque.removeLast()); + } + if(operatorDeque.size() == 0) { + operatorDeque.add(item); } - if(operatorDeque.size() == 0) operatorDeque.add(item); } } } @@ -59,7 +64,9 @@ public List infixToPostfix(String[] formulaList){ public String postfixCalculate(List postfixOperator){ Deque numberDeque = new ArrayDeque<>(); for(String item : postfixOperator){ - if(item.matches(numberMatch)) numberDeque.add(item); + if(item.matches(numberMatch)) { + numberDeque.add(item); + } if(item.matches(operatorMatch)){ int num2 = Integer.parseInt(numberDeque.removeLast()); int num1 = Integer.parseInt(numberDeque.removeLast()); diff --git a/src/main/java/org/programmers/java/calculate/Operator.java b/src/main/java/org/programmers/java/calculation/Operator.java similarity index 65% rename from src/main/java/org/programmers/java/calculate/Operator.java rename to src/main/java/org/programmers/java/calculation/Operator.java index 46dc4e89b..19ff9b803 100644 --- a/src/main/java/org/programmers/java/calculate/Operator.java +++ b/src/main/java/org/programmers/java/calculation/Operator.java @@ -1,6 +1,4 @@ -package org.programmers.java.calculate; - -import java.util.function.BiFunction; +package org.programmers.java.calculation; public class Operator { @@ -14,7 +12,9 @@ static public int multiply(int a, int b){ return a * b; } static public int divide(int a, int b){ - if(b == 0) throw new ArithmeticException("0으로 나눌 수 없습니다."); + if(b == 0) { + throw new ArithmeticException("0으로 나눌 수 없습니다."); + } return a / b; } } diff --git a/src/main/java/org/programmers/java/console/Console.java b/src/main/java/org/programmers/java/console/Console.java index 59458034c..c5af6e9b2 100644 --- a/src/main/java/org/programmers/java/console/Console.java +++ b/src/main/java/org/programmers/java/console/Console.java @@ -1,7 +1,6 @@ package org.programmers.java.console; -import org.programmers.java.message.InfoMsg; -import org.programmers.java.validation.Validation; +import org.programmers.java.message.Info; import java.util.Map; import java.util.Scanner; @@ -20,24 +19,23 @@ public static Console getInstance(){ return ConsoleSingleton.consoleInstance; } - @Override - public String numInput() { + public String selectNumInput() { String numInput = scanner.nextLine(); return numInput; } @Override - public String calculationInput() { - String calculationInput = scanner.nextLine(); - return calculationInput; + public String formulaInput() { + String formulaInput = scanner.nextLine(); + return formulaInput; } @Override public void menuMsg() { - System.out.println(InfoMsg.SELECT_MESSGAE.getInfoMsg()); - System.out.println(InfoMsg.CALCULATION_MESSAGE.getInfoMsg()); - System.out.println(InfoMsg.EXIT_MESSAGE.getInfoMsg()); + System.out.println(Info.SELECT.getMsg()); + System.out.println(Info.CALCULATION.getMsg()); + System.out.println(Info.EXIT.getMsg()); } @Override @@ -47,7 +45,7 @@ public void errorMsg(String msg) { @Override public void selectMsg(String selectNum) { - System.out.println(InfoMsg.SELECT_NUM_MESSAGE.getInfoMsg() + selectNum); + System.out.println(Info.SELECT_NUM.getMsg() + selectNum); } @Override @@ -61,15 +59,15 @@ public void calculationValue(String value) { } @Override - public void getCalculationValues(Map values) { - for (Long key : values.keySet()) { - String value = values.get(key); + public void getCalculationValues(Map calculationValues) { + for (Long key : calculationValues.keySet()) { + String value = calculationValues.get(key); System.out.println(value); } } @Override public void exitMsg() { - System.out.println(InfoMsg.EXIT_INFO_MESSAGE.getInfoMsg()); + System.out.println(Info.EXIT_INFO.getMsg()); } } diff --git a/src/main/java/org/programmers/java/console/Input.java b/src/main/java/org/programmers/java/console/Input.java index 6687ca3bc..00517c69d 100644 --- a/src/main/java/org/programmers/java/console/Input.java +++ b/src/main/java/org/programmers/java/console/Input.java @@ -1,6 +1,6 @@ package org.programmers.java.console; public interface Input { - String numInput(); - String calculationInput(); + String selectNumInput(); + String formulaInput(); } diff --git a/src/main/java/org/programmers/java/message/Error.java b/src/main/java/org/programmers/java/message/Error.java new file mode 100644 index 000000000..c8b0a3a03 --- /dev/null +++ b/src/main/java/org/programmers/java/message/Error.java @@ -0,0 +1,16 @@ +package org.programmers.java.message; + +public enum Error { + CALCULATE_VALIDATION("잘못된 연산식이 입력되었습니다. 형식을 맞춰주세요. ex) 2 + 4 ..."), + SELECT_VALIDATION("선택된 번호는 존재하지 않습니다. 1-3 사이의 숫자를 선택해주세요"); + + private final String msg; + + Error(String msg) { + this.msg = msg; + } + + public String getMsg() { + return msg; + } +} diff --git a/src/main/java/org/programmers/java/message/ErrorMsg.java b/src/main/java/org/programmers/java/message/ErrorMsg.java deleted file mode 100644 index ba8e9c2cb..000000000 --- a/src/main/java/org/programmers/java/message/ErrorMsg.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.programmers.java.message; - -public enum ErrorMsg { - CALCULATE_VALIDATION_ERROR_MSG("잘못된 입력 값 입니다. 형식을 맞춰주세요. ex) 2 + 4 ..."), - SELECT_VALIDATION_ERROR_MSG("잘못된 입력 값 입니다. 1-3 사이의 숫자를 선택해주세요"); - - private final String errorMsg; - - ErrorMsg(String errorMsg) { - this.errorMsg = errorMsg; - } - - public String getErrorMsg() { - return errorMsg; - } -} diff --git a/src/main/java/org/programmers/java/message/Info.java b/src/main/java/org/programmers/java/message/Info.java new file mode 100644 index 000000000..22be5d6d1 --- /dev/null +++ b/src/main/java/org/programmers/java/message/Info.java @@ -0,0 +1,19 @@ +package org.programmers.java.message; + +public enum Info { + SELECT("1. 조회"), + CALCULATION("2. 계산"), + EXIT("3. 종료"), + SELECT_NUM("선택 : "), + EXIT_INFO("프로그램이 종료되었습니다"); + + + private final String msg; + Info(String msg) { + this.msg = msg; + } + + public String getMsg() { + return msg; + } +} diff --git a/src/main/java/org/programmers/java/message/InfoMsg.java b/src/main/java/org/programmers/java/message/InfoMsg.java deleted file mode 100644 index a11f8c850..000000000 --- a/src/main/java/org/programmers/java/message/InfoMsg.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.programmers.java.message; - -public enum InfoMsg { - SELECT_MESSGAE("1. 조회"), - CALCULATION_MESSAGE("2. 계산"), - EXIT_MESSAGE("3. 종료"), - SELECT_NUM_MESSAGE("선택 : "), - EXIT_INFO_MESSAGE("프로그램이 종료되었습니다"); - - - private final String infoMsg; - InfoMsg(String infoMsg) { - this.infoMsg = infoMsg; - } - - public String getInfoMsg() { - return infoMsg; - } -} diff --git a/src/main/java/org/programmers/java/validation/Validation.java b/src/main/java/org/programmers/java/validation/Validation.java deleted file mode 100644 index 3a7c73932..000000000 --- a/src/main/java/org/programmers/java/validation/Validation.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.programmers.java.validation; - -import org.programmers.java.console.Output; -import org.programmers.java.message.ErrorMsg; - -import java.util.ArrayList; -import java.util.List; - -public class Validation { - private final Output output; - private final String numberMatch = "[0-9]+"; - private final String operatorMatch = "[*+/-]"; - - - public Validation(Output output) { - this.output = output; - } - - // 연산식 검증 로직 - public boolean calculateValidation(String inputMsg) { - Boolean afterCheck = false; - - List formulaList = formulaSplitValidation(inputMsg); - - if(formulaList.size() != 0) afterCheck = checkFormulaValidation(formulaList); - - if(!afterCheck) output.errorMsg(ErrorMsg.CALCULATE_VALIDATION_ERROR_MSG.getErrorMsg()); - - return afterCheck; - } - - - // 연산식 검증: 연산식 분해 후 하나씩 검증 - public List formulaSplitValidation(String inputMsg){ - String[] splitMsg = inputMsg.split(" "); - List formulaBeforeValidation = new ArrayList<>(); - - for(String str : splitMsg){ - if(str.matches(numberMatch)) formulaBeforeValidation.add(str); - else if(str.matches(operatorMatch)) formulaBeforeValidation.add(str); - else { - output.errorMsg(ErrorMsg.CALCULATE_VALIDATION_ERROR_MSG.getErrorMsg()); - formulaBeforeValidation.clear(); - break; - } - } - return formulaBeforeValidation; - } - - - // 연산식 검증: 연산자와 피연산자의 전체 개수 검증 및 위치 검증 - public boolean checkFormulaValidation(List formulaList){ - if(formulaList.size() % 2 == 0) return false; - - for(int i=0; i < formulaList.size(); i++){ - if(i % 2 == 0 && !formulaList.get(i).matches(numberMatch)) return false; - if(i % 2 == 1 && !formulaList.get(i).matches(operatorMatch)) return false; - } - - return true; - } -} diff --git a/src/main/java/org/programmers/java/validator/Validator.java b/src/main/java/org/programmers/java/validator/Validator.java new file mode 100644 index 000000000..e6c400d16 --- /dev/null +++ b/src/main/java/org/programmers/java/validator/Validator.java @@ -0,0 +1,81 @@ +package org.programmers.java.validator; + +import org.programmers.java.console.Output; +import org.programmers.java.message.Error; + +import java.util.ArrayList; +import java.util.List; + +public class Validator { + private final Output output; + private final String numberMatch = "[0-9]+"; + private final String operatorMatch = "[*+/-]"; + + + public Validator(Output output) { + this.output = output; + } + + // 연산식 검증 로직 + public boolean formulaValidate(String formulaInput) { + boolean isNormalFormula = false; + + List formularAfterSplitValidate = formulaSplitValidate(formulaInput); + + if(formularAfterSplitValidate.size() != 0) { + isNormalFormula = formulaCountValidate(formularAfterSplitValidate); + } + + if(!isNormalFormula) { + output.errorMsg(Error.CALCULATE_VALIDATION.getMsg()); + } + + return isNormalFormula; + } + + + // 연산식 검증: 연산식 분해 후 하나씩 검증 + public List formulaSplitValidate(String formulaInput){ + String[] splitFormula = formulaInput.split(" "); + List formularAfterSplitValidate = new ArrayList<>(); + + for(String operatorOrOperand : splitFormula){ + if(operatorOrOperand.matches(numberMatch)) { + formularAfterSplitValidate.add(operatorOrOperand); + } + + if(operatorOrOperand.matches(operatorMatch)) { + formularAfterSplitValidate.add(operatorOrOperand); + } + + if(!operatorOrOperand.matches(numberMatch) && !operatorOrOperand.matches(operatorMatch)){ + output.errorMsg(Error.CALCULATE_VALIDATION.getMsg()); + formularAfterSplitValidate.clear(); + break; + } + } + return formularAfterSplitValidate; + } + + + // 연산식 검증: 연산자와 피연산자의 전체 개수 검증 및 위치 검증 + public boolean formulaCountValidate(List formularAfterSplitValidate){ + boolean isNormalFormula = false; + + if(formularAfterSplitValidate.size() % 2 == 0) { + return isNormalFormula; + } + + for(int i=0; i < formularAfterSplitValidate.size(); i++){ + if(i % 2 == 0 && !formularAfterSplitValidate.get(i).matches(numberMatch)) { + return isNormalFormula; + } + + if(i % 2 == 1 && !formularAfterSplitValidate.get(i).matches(operatorMatch)) { + return isNormalFormula; + } + } + + return true; + } +} diff --git a/src/test/java/org/programmers/java/CalculateTest.java b/src/test/java/org/programmers/java/CalculationTest.java similarity index 70% rename from src/test/java/org/programmers/java/CalculateTest.java rename to src/test/java/org/programmers/java/CalculationTest.java index 63c92a2a3..886e9ca2b 100644 --- a/src/test/java/org/programmers/java/CalculateTest.java +++ b/src/test/java/org/programmers/java/CalculationTest.java @@ -3,16 +3,14 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.CsvSource; -import org.programmers.java.calculate.Calculate; +import org.programmers.java.calculation.Calculation; import java.util.Arrays; import java.util.List; -public class CalculateTest { +public class CalculationTest { - Calculate calculate = new Calculate(); + Calculation calculation = new Calculation(); @Test @DisplayName("중위 표기식 -> 후위 표기식 변경") @@ -22,7 +20,7 @@ void infixToPostfix(){ List postfixExpect = Arrays.asList("3","5","10","*","+"); // when - List postfix = calculate.infixToPostfix(formulaList); + List postfix = calculation.infixToPostfix(formulaList); // then Assertions.assertEquals(postfixExpect, postfix); @@ -35,7 +33,7 @@ void postfixCalculate(){ List postfix = Arrays.asList("3","5","10","*","+"); // when - String calculateValue = calculate.postfixCalculate(postfix); + String calculateValue = calculation.postfixCalculate(postfix); // then Assertions.assertEquals("53", calculateValue); diff --git a/src/test/java/org/programmers/java/OperatorTest.java b/src/test/java/org/programmers/java/OperatorTest.java index 87b6ec394..907bce959 100644 --- a/src/test/java/org/programmers/java/OperatorTest.java +++ b/src/test/java/org/programmers/java/OperatorTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.programmers.java.calculate.Operator; +import org.programmers.java.calculation.Operator; public class OperatorTest { diff --git a/src/test/java/org/programmers/java/ValidaionTest.java b/src/test/java/org/programmers/java/ValidaionTest.java index e5232a989..e957ba19f 100644 --- a/src/test/java/org/programmers/java/ValidaionTest.java +++ b/src/test/java/org/programmers/java/ValidaionTest.java @@ -4,8 +4,7 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.programmers.java.console.Console; -import org.programmers.java.console.Output; -import org.programmers.java.validation.Validation; +import org.programmers.java.validator.Validator; import java.util.Arrays; import java.util.List; @@ -13,7 +12,7 @@ public class ValidaionTest { - Validation validation = new Validation(Console.getInstance()); + Validator validator = new Validator(Console.getInstance()); @Test @DisplayName("연산식 검증: 연산식 분해 검증") @@ -23,7 +22,7 @@ void formulaSplitValidation(){ List formulaTest = Arrays.asList("10", "+", "4", "/", "20", "*", "3", "-", "2"); // when - List formulaList = validation.formulaSplitValidation(inputMsg); + List formulaList = validator.formulaSplitValidate(inputMsg); // then Assertions.assertEquals(formulaList, formulaTest); @@ -36,7 +35,7 @@ void checkFormulaValidation(){ List formulaList = Arrays.asList("10", "+", "4", "/", "20", "*", "3", "-", "2"); // when - Boolean checkedFormulaValidation = validation.checkFormulaValidation(formulaList); + Boolean checkedFormulaValidation = validator.formulaCountValidate(formulaList); // then Assertions.assertEquals(checkedFormulaValidation, true); From b74dfe16d877721bced630b8e0339a0b4ba46a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=99=A9=EC=B0=BD=ED=98=84?= Date: Sat, 10 Jun 2023 21:49:49 +0900 Subject: [PATCH 12/34] =?UTF-8?q?refactor:=20=EB=A7=A4=EC=A7=81=EB=84=98?= =?UTF-8?q?=EB=B2=84=20=EC=A0=9C=EA=B1=B0=20=EB=B0=8F=20=EB=A9=94=EC=8B=9C?= =?UTF-8?q?=EC=A7=80=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/programmers/java/Calculator.java | 32 +++++++++++++----- .../org/programmers/java/console/Console.java | 7 ++-- .../java/message/FunctionSelect.java | 33 +++++++++++++++++++ .../org/programmers/java/message/Info.java | 3 -- 4 files changed, 61 insertions(+), 14 deletions(-) create mode 100644 src/main/java/org/programmers/java/message/FunctionSelect.java diff --git a/src/main/java/org/programmers/java/Calculator.java b/src/main/java/org/programmers/java/Calculator.java index f43ce1cb0..a2d68ef02 100644 --- a/src/main/java/org/programmers/java/Calculator.java +++ b/src/main/java/org/programmers/java/Calculator.java @@ -4,11 +4,14 @@ import org.programmers.java.console.Input; import org.programmers.java.console.Output; import org.programmers.java.message.Error; +import org.programmers.java.message.FunctionSelect; import org.programmers.java.repository.FormulaRepository; import org.programmers.java.validator.Validator; +import java.util.Optional; + public class Calculator { - private boolean exitStatus = true; + private boolean programStatus = true; private final Input input; private final Output output; private final Calculation calculation; @@ -24,27 +27,40 @@ public class Calculator { } void run() { - while (exitStatus) { + while (programStatus) { output.menuMsg(); String selectNum = input.selectNumInput(); output.selectMsg(selectNum); - switch (selectNum) { - case "1": + Optional selectMenu = getFunctionSelectNumber(selectNum); + + switch (selectMenu.get()) { + case CHECK: output.getCalculationValues(formulaRepository.getFormulaList()); break; - case "2": + case CALCULATION: formulaCalculate(); break; - case "3": + case EXIT: output.exitMsg(); - exitStatus = false; + programStatus = false; break; - default: + case WRONGINPUT: output.errorMsg(Error.SELECT_VALIDATION.getMsg()); + break; } } } + private Optional getFunctionSelectNumber(String selectNum) { + Optional selectMenu = FunctionSelect.findSelect(selectNum); + + if(selectMenu.isEmpty()){ + selectMenu.orElse(FunctionSelect.WRONGINPUT); + } + + return selectMenu; + } + private void formulaCalculate() { String formula = input.formulaInput(); diff --git a/src/main/java/org/programmers/java/console/Console.java b/src/main/java/org/programmers/java/console/Console.java index c5af6e9b2..5b2c39c98 100644 --- a/src/main/java/org/programmers/java/console/Console.java +++ b/src/main/java/org/programmers/java/console/Console.java @@ -1,5 +1,6 @@ package org.programmers.java.console; +import org.programmers.java.message.FunctionSelect; import org.programmers.java.message.Info; import java.util.Map; @@ -33,9 +34,9 @@ public String formulaInput() { @Override public void menuMsg() { - System.out.println(Info.SELECT.getMsg()); - System.out.println(Info.CALCULATION.getMsg()); - System.out.println(Info.EXIT.getMsg()); + System.out.println(FunctionSelect.CHECK.getMsg()); + System.out.println(FunctionSelect.CALCULATION.getMsg()); + System.out.println(FunctionSelect.EXIT.getMsg()); } @Override diff --git a/src/main/java/org/programmers/java/message/FunctionSelect.java b/src/main/java/org/programmers/java/message/FunctionSelect.java new file mode 100644 index 000000000..8c20d5d15 --- /dev/null +++ b/src/main/java/org/programmers/java/message/FunctionSelect.java @@ -0,0 +1,33 @@ +package org.programmers.java.message; + +import java.util.Arrays; +import java.util.Optional; + +public enum FunctionSelect { + CHECK("1. 조회", "1"), + CALCULATION("2. 계산", "2"), + EXIT("3. 종료", "3"), + WRONGINPUT("입력값 에러", "4"); + + public String getSelectNum() { + return selectNum; + } + + private final String msg; + private final String selectNum; + FunctionSelect(String msg, String selectNum) { + this.msg = msg; + this.selectNum = selectNum; + } + + public String getMsg() { + return msg; + } + + public static Optional findSelect(String inputSelectNum){ + + return Arrays.stream(FunctionSelect.values()) + .filter(function -> function.selectNum.equals(inputSelectNum)) + .findAny(); + } +} diff --git a/src/main/java/org/programmers/java/message/Info.java b/src/main/java/org/programmers/java/message/Info.java index 22be5d6d1..3321eb6bf 100644 --- a/src/main/java/org/programmers/java/message/Info.java +++ b/src/main/java/org/programmers/java/message/Info.java @@ -1,9 +1,6 @@ package org.programmers.java.message; public enum Info { - SELECT("1. 조회"), - CALCULATION("2. 계산"), - EXIT("3. 종료"), SELECT_NUM("선택 : "), EXIT_INFO("프로그램이 종료되었습니다"); From c3082d63a0796c0dd82b4d182d68ccc685b43434 Mon Sep 17 00:00:00 2001 From: changhyeon Date: Mon, 12 Jun 2023 18:20:54 +0900 Subject: [PATCH 13/34] =?UTF-8?q?refactor:=20Operator=20enum=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD,=20Calculation=20=EA=B0=9D?= =?UTF-8?q?=EC=B2=B4=20=EB=B6=84=EB=A6=AC,=20Calculation=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=EA=B0=9D=EC=B2=B4=20=EB=A9=94=EC=86=8C=EB=93=9C=20?= =?UTF-8?q?=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/programmers/java/App.java | 6 +- .../java/org/programmers/java/Calculator.java | 15 +--- .../java/calculation/Calculation.java | 89 ++----------------- .../calculation/InfixToPostfixConverter.java | 47 ++++++++++ .../java/calculation/Operator.java | 48 +++++++--- .../java/calculation/PostfixCalculation.java | 33 +++++++ .../org/programmers/java/CalculationTest.java | 9 +- .../org/programmers/java/OperatorTest.java | 8 +- 8 files changed, 144 insertions(+), 111 deletions(-) create mode 100644 src/main/java/org/programmers/java/calculation/InfixToPostfixConverter.java create mode 100644 src/main/java/org/programmers/java/calculation/PostfixCalculation.java diff --git a/src/main/java/org/programmers/java/App.java b/src/main/java/org/programmers/java/App.java index c016a907a..fd3dd5b6b 100644 --- a/src/main/java/org/programmers/java/App.java +++ b/src/main/java/org/programmers/java/App.java @@ -1,6 +1,8 @@ package org.programmers.java; import org.programmers.java.calculation.Calculation; +import org.programmers.java.calculation.InfixToPostfixConverter; +import org.programmers.java.calculation.PostfixCalculation; import org.programmers.java.console.Console; import org.programmers.java.repository.FormulaRepository; import org.programmers.java.repository.FormulaMemoryRepository; @@ -9,7 +11,9 @@ public class App { public static void main(String[] args){ Console console = Console.getInstance(); - Calculation calculation = new Calculation(); + InfixToPostfixConverter infixToPostfixConverter = new InfixToPostfixConverter(); + PostfixCalculation postfixCalculation = new PostfixCalculation(); + Calculation calculation = new Calculation(infixToPostfixConverter, postfixCalculation); FormulaRepository formulaRepository = new FormulaMemoryRepository(); Validator validator = new Validator(console); Calculator calculator = new Calculator(console, console, calculation, formulaRepository, validator); diff --git a/src/main/java/org/programmers/java/Calculator.java b/src/main/java/org/programmers/java/Calculator.java index a2d68ef02..2f9fb6fa5 100644 --- a/src/main/java/org/programmers/java/Calculator.java +++ b/src/main/java/org/programmers/java/Calculator.java @@ -31,9 +31,8 @@ void run() { output.menuMsg(); String selectNum = input.selectNumInput(); output.selectMsg(selectNum); - Optional selectMenu = getFunctionSelectNumber(selectNum); - - switch (selectMenu.get()) { + FunctionSelect selectMenu = getFunctionSelectNumber(selectNum); + switch (selectMenu) { case CHECK: output.getCalculationValues(formulaRepository.getFormulaList()); break; @@ -51,14 +50,8 @@ void run() { } } - private Optional getFunctionSelectNumber(String selectNum) { - Optional selectMenu = FunctionSelect.findSelect(selectNum); - - if(selectMenu.isEmpty()){ - selectMenu.orElse(FunctionSelect.WRONGINPUT); - } - - return selectMenu; + private FunctionSelect getFunctionSelectNumber(String selectNum) { + return FunctionSelect.findSelect(selectNum).orElse(FunctionSelect.WRONGINPUT); } private void formulaCalculate() { diff --git a/src/main/java/org/programmers/java/calculation/Calculation.java b/src/main/java/org/programmers/java/calculation/Calculation.java index 8a1e8bdaa..232c788d3 100644 --- a/src/main/java/org/programmers/java/calculation/Calculation.java +++ b/src/main/java/org/programmers/java/calculation/Calculation.java @@ -4,89 +4,18 @@ public class Calculation { - private final String numberMatch = "[0-9]+"; - private final String operatorMatch = "[*+/-]"; - private final Map operatorPriority = Map.of( - "+", 1, - "-", 1, - "*", 2, - "/", 2 - ); + private final InfixToPostfixConverter infixToPostfixConverter; + private final PostfixCalculation postfixCalculation; + + public Calculation(InfixToPostfixConverter infixToPostfixConverter, PostfixCalculation postfixCalculation) { + this.infixToPostfixConverter = infixToPostfixConverter; + this.postfixCalculation = postfixCalculation; + } - // 연산 요청 후 연산 작업 로직 public String requestCalculate(String inputFormula){ String[] formulaList = inputFormula.split(" "); - List postfixOperator = infixToPostfix(formulaList); - String result = postfixCalculate(postfixOperator); + List postfixOperator = infixToPostfixConverter.convert(formulaList); + String result = postfixCalculation.calculate(postfixOperator); return result; } - - // 중위 -> 후위 - public List infixToPostfix(String[] formulaList){ - - List postfixOperator = new ArrayList<>(); - Deque operatorDeque = new ArrayDeque<>(); - - for(String item : formulaList){ - if(item.matches(numberMatch)){ - postfixOperator.add(item); - } - if(item.matches(operatorMatch)){ - if(operatorDeque.size() == 0) { - operatorDeque.add(item); - continue; - } - if(operatorDeque.size() != 0){ - while(operatorDeque.size() > 0){ - if(operatorPriority.get(operatorDeque.peekLast()) <= operatorPriority.get(item)) { - operatorDeque.add(item); - break; - } - postfixOperator.add(operatorDeque.removeLast()); - } - if(operatorDeque.size() == 0) { - operatorDeque.add(item); - } - } - } - } - - while(operatorDeque.size() > 0){ - postfixOperator.add(operatorDeque.removeLast()); - } - - - return postfixOperator; - } - - - // 후위 -> 연산 - public String postfixCalculate(List postfixOperator){ - Deque numberDeque = new ArrayDeque<>(); - for(String item : postfixOperator){ - if(item.matches(numberMatch)) { - numberDeque.add(item); - } - if(item.matches(operatorMatch)){ - int num2 = Integer.parseInt(numberDeque.removeLast()); - int num1 = Integer.parseInt(numberDeque.removeLast()); - - switch (item){ - case "+": - numberDeque.add(String.valueOf(Operator.plus(num1, num2))); - break; - case "-": - numberDeque.add(String.valueOf(Operator.minus(num1, num2))); - break; - case "*": - numberDeque.add(String.valueOf(Operator.multiply(num1, num2))); - break; - case "/": - numberDeque.add(String.valueOf(Operator.divide(num1, num2))); - break; - } - } - } - return numberDeque.removeLast(); - } } diff --git a/src/main/java/org/programmers/java/calculation/InfixToPostfixConverter.java b/src/main/java/org/programmers/java/calculation/InfixToPostfixConverter.java new file mode 100644 index 000000000..156431ff8 --- /dev/null +++ b/src/main/java/org/programmers/java/calculation/InfixToPostfixConverter.java @@ -0,0 +1,47 @@ +package org.programmers.java.calculation; + +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Deque; +import java.util.List; + +public class InfixToPostfixConverter { + List postfixOperator = new ArrayList<>(); + Deque operatorDeque = new ArrayDeque<>(); + + public List convert(String[] formulaList){ + for(String operatorOrOperand : formulaList){ + operandAddInPostfix(operatorOrOperand); + checkOperatorToAddPostfix(operatorOrOperand); + } + while(operatorDeque.size() > 0){ + postfixOperator.add(operatorDeque.removeLast()); + } + + return postfixOperator; + } + + private void operandAddInPostfix(String operatorOrOperand){ + if(Operator.isNumber(operatorOrOperand)){ + postfixOperator.add(operatorOrOperand); + } + } + + private void checkOperatorToAddPostfix(String operatorOrOperand) { + if (Operator.isSymbol(operatorOrOperand).isPresent()) { + checkOperatorStackAndCompare(operatorOrOperand); + } + } + + private void checkOperatorStackAndCompare(String operatorOrOperand){ + while (!operatorDeque.isEmpty() && comparePriorities(operatorOrOperand)) { + postfixOperator.add(operatorDeque.removeLast()); + } + + operatorDeque.add(operatorOrOperand); + } + + private boolean comparePriorities(String operatorOrOperand){ + return Operator.comparePriorities(operatorDeque.peekLast(), operatorOrOperand); + } +} diff --git a/src/main/java/org/programmers/java/calculation/Operator.java b/src/main/java/org/programmers/java/calculation/Operator.java index 19ff9b803..35bb806a0 100644 --- a/src/main/java/org/programmers/java/calculation/Operator.java +++ b/src/main/java/org/programmers/java/calculation/Operator.java @@ -1,20 +1,44 @@ package org.programmers.java.calculation; -public class Operator { +import java.util.Arrays; +import java.util.Optional; +import java.util.function.BiFunction; +import java.util.regex.Pattern; + +public enum Operator { + PLUS("+", 2, (a, b) -> a + b), + MINUS("-", 2, (a, b) -> a - b), + MULTIPLY("*", 1, (a, b) -> a * b), + DIVIDE("/", 1, (a, b) -> a / b); + + 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 boolean comparePriorities(String firstSymbol, String secondSymbol){ + return Integer.parseInt(firstSymbol) > Integer.parseInt(secondSymbol); - static public int plus(int a, int b){ - return a + b; } - static public int minus(int a, int b){ - return a - b; + + public static int arithmeticExpression(String symbol, int firstOperand, int secondOperand){ + return isSymbol(symbol).get().expression.apply(firstOperand, secondOperand); } - static public int multiply(int a, int b){ - return a * b; + + + public static Optional isSymbol(String inputSymbol){ + return Arrays.stream(values()) + .filter(operator -> operator.symbol.equals(inputSymbol)) + .findAny(); } - static public int divide(int a, int b){ - if(b == 0) { - throw new ArithmeticException("0으로 나눌 수 없습니다."); - } - return a / b; + + public static boolean isNumber(String inputNumber){ + return Pattern.matches("[0-9]+",inputNumber); } } diff --git a/src/main/java/org/programmers/java/calculation/PostfixCalculation.java b/src/main/java/org/programmers/java/calculation/PostfixCalculation.java new file mode 100644 index 000000000..3659fa906 --- /dev/null +++ b/src/main/java/org/programmers/java/calculation/PostfixCalculation.java @@ -0,0 +1,33 @@ +package org.programmers.java.calculation; + +import java.util.ArrayDeque; +import java.util.Deque; +import java.util.List; + +public class PostfixCalculation { + Deque numberDeque = new ArrayDeque<>(); + + public String calculate(List postfixOperator){ + for(String operatorOrOperand : postfixOperator){ + numberAddInStack(operatorOrOperand); + calculationResultAddInStack(operatorOrOperand); + } + + return numberDeque.removeLast(); + } + + private void numberAddInStack(String operatorOrOperand){ + if(Operator.isNumber(operatorOrOperand)) { + numberDeque.add(operatorOrOperand); + } + } + + private void calculationResultAddInStack(String operatorOrOperand) { + if(Operator.isSymbol(operatorOrOperand).isPresent()){ + int num2 = Integer.parseInt(numberDeque.removeLast()); + int num1 = Integer.parseInt(numberDeque.removeLast()); + + numberDeque.add(String.valueOf(Operator.arithmeticExpression(operatorOrOperand, num1, num2))); + } + } +} diff --git a/src/test/java/org/programmers/java/CalculationTest.java b/src/test/java/org/programmers/java/CalculationTest.java index 886e9ca2b..a7f32b6cc 100644 --- a/src/test/java/org/programmers/java/CalculationTest.java +++ b/src/test/java/org/programmers/java/CalculationTest.java @@ -4,13 +4,16 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.programmers.java.calculation.Calculation; +import org.programmers.java.calculation.InfixToPostfixConverter; +import org.programmers.java.calculation.PostfixCalculation; import java.util.Arrays; import java.util.List; public class CalculationTest { - Calculation calculation = new Calculation(); + InfixToPostfixConverter infixToPostfixConverter = new InfixToPostfixConverter(); + PostfixCalculation postfixCalculation = new PostfixCalculation(); @Test @DisplayName("중위 표기식 -> 후위 표기식 변경") @@ -20,7 +23,7 @@ void infixToPostfix(){ List postfixExpect = Arrays.asList("3","5","10","*","+"); // when - List postfix = calculation.infixToPostfix(formulaList); + List postfix = infixToPostfixConverter.convert(formulaList); // then Assertions.assertEquals(postfixExpect, postfix); @@ -33,7 +36,7 @@ void postfixCalculate(){ List postfix = Arrays.asList("3","5","10","*","+"); // when - String calculateValue = calculation.postfixCalculate(postfix); + String calculateValue = postfixCalculation.calculate(postfix); // then Assertions.assertEquals("53", calculateValue); diff --git a/src/test/java/org/programmers/java/OperatorTest.java b/src/test/java/org/programmers/java/OperatorTest.java index 907bce959..1b69d5453 100644 --- a/src/test/java/org/programmers/java/OperatorTest.java +++ b/src/test/java/org/programmers/java/OperatorTest.java @@ -10,9 +10,9 @@ public class OperatorTest { @Test @DisplayName("사칙연산 테스트") void operatorCalculate(){ - Assertions.assertEquals(10, Operator.plus(5, 5)); - Assertions.assertEquals(3, Operator.minus(5, 2)); - Assertions.assertEquals(30, Operator.multiply(10, 3)); - Assertions.assertEquals(5, Operator.divide(40, 8)); + Assertions.assertEquals(10, Operator.arithmeticExpression("+", 5, 5)); + Assertions.assertEquals(3, Operator.arithmeticExpression("-", 5, 2)); + Assertions.assertEquals(30, Operator.arithmeticExpression("*", 10, 3)); + Assertions.assertEquals(5, Operator.arithmeticExpression("/", 40, 8)); } } From 3e384b21dfd0e72812a427c790f948cfc97aa070 Mon Sep 17 00:00:00 2001 From: changhyeon Date: Mon, 12 Jun 2023 18:27:58 +0900 Subject: [PATCH 14/34] =?UTF-8?q?fix:=20=EA=B3=84=EC=82=B0=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=EC=A4=91=20=EC=9A=B0=EC=84=A0=EC=88=9C=EC=9C=84=20?= =?UTF-8?q?=EC=97=B0=EC=82=B0=EC=9E=90=20=EB=B9=84=EA=B5=90=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/programmers/java/calculation/Operator.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/programmers/java/calculation/Operator.java b/src/main/java/org/programmers/java/calculation/Operator.java index 35bb806a0..33189120f 100644 --- a/src/main/java/org/programmers/java/calculation/Operator.java +++ b/src/main/java/org/programmers/java/calculation/Operator.java @@ -21,9 +21,11 @@ public enum Operator { this.priority = priority; this.expression = expression; } - + private int getPriority() { + return priority; + } public static boolean comparePriorities(String firstSymbol, String secondSymbol){ - return Integer.parseInt(firstSymbol) > Integer.parseInt(secondSymbol); + return Operator.isSymbol(firstSymbol).get().getPriority() > Operator.isSymbol(secondSymbol).get().getPriority(); } From 1e9b2f09de038f4dee50680664b01a139a819ad8 Mon Sep 17 00:00:00 2001 From: changhyeon Date: Mon, 12 Jun 2023 18:56:03 +0900 Subject: [PATCH 15/34] =?UTF-8?q?refactor:=20Validator=20=EA=B0=9D?= =?UTF-8?q?=EC=B2=B4=20=EB=B6=84=EB=A6=AC,=20Validator=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=EA=B0=9D=EC=B2=B4=20=EB=A9=94=EC=86=8C=EB=93=9C=20?= =?UTF-8?q?=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/validator/FormulaCountValidator.java | 38 +++++++++++++ .../java/validator/FormulaSplitValidator.java | 44 ++++++++++++++ .../programmers/java/validator/Validator.java | 57 ++----------------- .../org/programmers/java/ValidaionTest.java | 9 ++- 4 files changed, 94 insertions(+), 54 deletions(-) create mode 100644 src/main/java/org/programmers/java/validator/FormulaCountValidator.java create mode 100644 src/main/java/org/programmers/java/validator/FormulaSplitValidator.java diff --git a/src/main/java/org/programmers/java/validator/FormulaCountValidator.java b/src/main/java/org/programmers/java/validator/FormulaCountValidator.java new file mode 100644 index 000000000..fc0c242f3 --- /dev/null +++ b/src/main/java/org/programmers/java/validator/FormulaCountValidator.java @@ -0,0 +1,38 @@ +package org.programmers.java.validator; + +import org.programmers.java.calculation.Operator; + +import java.util.List; + +public class FormulaCountValidator { + // 연산식 검증: 연산자와 피연산자의 전체 개수 검증 및 위치 검증 + public boolean validate(List formularAfterSplitValidate){ + boolean isNormalFormula = false; + + if(formularAfterSplitValidate.size() % 2 == 0) { + return isNormalFormula; + } + + for(int i=0; i < formularAfterSplitValidate.size(); i++){ + String operatorOrOperand = formularAfterSplitValidate.get(i); + + if (checkOperatorAndOperandLocation(i, operatorOrOperand)) { + return isNormalFormula; + } + } + + return true; + } + + private boolean checkOperatorAndOperandLocation(int index, String operatorOrOperand) { + if(index % 2 == 0 && !Operator.isNumber(operatorOrOperand)) { + return true; + } + + if(index % 2 == 1 && !Operator.isSymbol(operatorOrOperand).isPresent()) { + return true; + } + + return false; + } +} diff --git a/src/main/java/org/programmers/java/validator/FormulaSplitValidator.java b/src/main/java/org/programmers/java/validator/FormulaSplitValidator.java new file mode 100644 index 000000000..1f0fa4bb5 --- /dev/null +++ b/src/main/java/org/programmers/java/validator/FormulaSplitValidator.java @@ -0,0 +1,44 @@ +package org.programmers.java.validator; + +import org.programmers.java.calculation.Operator; +import org.programmers.java.console.Output; +import org.programmers.java.message.Error; + +import java.util.ArrayList; +import java.util.List; + +public class FormulaSplitValidator { + + private final Output output; + private List formularAfterSplitValidate = new ArrayList<>(); + + public FormulaSplitValidator(Output output) { + this.output = output; + } + + // 연산식 검증: 연산식 분해 후 하나씩 검증 + public List validate(String formulaInput){ + String[] splitFormula = formulaInput.split(" "); + + for(String operatorOrOperand : splitFormula){ + splitValidateAddInList(operatorOrOperand); + } + + return formularAfterSplitValidate; + } + + private void splitValidateAddInList(String operatorOrOperand){ + if(Operator.isNumber(operatorOrOperand)) { + formularAfterSplitValidate.add(operatorOrOperand); + } + + if(Operator.isSymbol(operatorOrOperand).isPresent()) { + formularAfterSplitValidate.add(operatorOrOperand); + } + + if(!Operator.isNumber(operatorOrOperand) && !Operator.isSymbol(operatorOrOperand).isPresent()){ + output.errorMsg(Error.CALCULATE_VALIDATION.getMsg()); + formularAfterSplitValidate.clear(); + } + } +} diff --git a/src/main/java/org/programmers/java/validator/Validator.java b/src/main/java/org/programmers/java/validator/Validator.java index e6c400d16..8b54aab72 100644 --- a/src/main/java/org/programmers/java/validator/Validator.java +++ b/src/main/java/org/programmers/java/validator/Validator.java @@ -8,22 +8,23 @@ public class Validator { private final Output output; - private final String numberMatch = "[0-9]+"; - private final String operatorMatch = "[*+/-]"; - + private final FormulaCountValidator formulaCountValidator; + private final FormulaSplitValidator formulaSplitValidator; public Validator(Output output) { this.output = output; + this.formulaCountValidator = new FormulaCountValidator(); + this.formulaSplitValidator = new FormulaSplitValidator(output); } // 연산식 검증 로직 public boolean formulaValidate(String formulaInput) { boolean isNormalFormula = false; - List formularAfterSplitValidate = formulaSplitValidate(formulaInput); + List formularAfterSplitValidate = formulaSplitValidator.validate(formulaInput); if(formularAfterSplitValidate.size() != 0) { - isNormalFormula = formulaCountValidate(formularAfterSplitValidate); + isNormalFormula = formulaCountValidator.validate(formularAfterSplitValidate); } if(!isNormalFormula) { @@ -32,50 +33,4 @@ public boolean formulaValidate(String formulaInput) { return isNormalFormula; } - - - // 연산식 검증: 연산식 분해 후 하나씩 검증 - public List formulaSplitValidate(String formulaInput){ - String[] splitFormula = formulaInput.split(" "); - List formularAfterSplitValidate = new ArrayList<>(); - - for(String operatorOrOperand : splitFormula){ - if(operatorOrOperand.matches(numberMatch)) { - formularAfterSplitValidate.add(operatorOrOperand); - } - - if(operatorOrOperand.matches(operatorMatch)) { - formularAfterSplitValidate.add(operatorOrOperand); - } - - if(!operatorOrOperand.matches(numberMatch) && !operatorOrOperand.matches(operatorMatch)){ - output.errorMsg(Error.CALCULATE_VALIDATION.getMsg()); - formularAfterSplitValidate.clear(); - break; - } - } - return formularAfterSplitValidate; - } - - - // 연산식 검증: 연산자와 피연산자의 전체 개수 검증 및 위치 검증 - public boolean formulaCountValidate(List formularAfterSplitValidate){ - boolean isNormalFormula = false; - - if(formularAfterSplitValidate.size() % 2 == 0) { - return isNormalFormula; - } - - for(int i=0; i < formularAfterSplitValidate.size(); i++){ - if(i % 2 == 0 && !formularAfterSplitValidate.get(i).matches(numberMatch)) { - return isNormalFormula; - } - - if(i % 2 == 1 && !formularAfterSplitValidate.get(i).matches(operatorMatch)) { - return isNormalFormula; - } - } - - return true; - } } diff --git a/src/test/java/org/programmers/java/ValidaionTest.java b/src/test/java/org/programmers/java/ValidaionTest.java index e957ba19f..fa6d4aeee 100644 --- a/src/test/java/org/programmers/java/ValidaionTest.java +++ b/src/test/java/org/programmers/java/ValidaionTest.java @@ -4,6 +4,8 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.programmers.java.console.Console; +import org.programmers.java.validator.FormulaCountValidator; +import org.programmers.java.validator.FormulaSplitValidator; import org.programmers.java.validator.Validator; import java.util.Arrays; @@ -12,7 +14,8 @@ public class ValidaionTest { - Validator validator = new Validator(Console.getInstance()); + FormulaSplitValidator formulaSplitValidator = new FormulaSplitValidator(Console.getInstance()); + FormulaCountValidator formulaCountValidator = new FormulaCountValidator(); @Test @DisplayName("연산식 검증: 연산식 분해 검증") @@ -22,7 +25,7 @@ void formulaSplitValidation(){ List formulaTest = Arrays.asList("10", "+", "4", "/", "20", "*", "3", "-", "2"); // when - List formulaList = validator.formulaSplitValidate(inputMsg); + List formulaList = formulaSplitValidator.validate(inputMsg); // then Assertions.assertEquals(formulaList, formulaTest); @@ -35,7 +38,7 @@ void checkFormulaValidation(){ List formulaList = Arrays.asList("10", "+", "4", "/", "20", "*", "3", "-", "2"); // when - Boolean checkedFormulaValidation = validator.formulaCountValidate(formulaList); + Boolean checkedFormulaValidation = formulaCountValidator.validate(formulaList); // then Assertions.assertEquals(checkedFormulaValidation, true); From f12ab716560f74a890afc3336c84b2624e4b1ed7 Mon Sep 17 00:00:00 2001 From: changhyeon Date: Mon, 12 Jun 2023 19:54:43 +0900 Subject: [PATCH 16/34] =?UTF-8?q?fix:=20=EC=9A=B0=EC=84=A0=EC=88=9C?= =?UTF-8?q?=EC=9C=84=20=EB=B9=84=EA=B5=90=20=EA=B8=B0=EB=8A=A5=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81,=20=EC=97=B0=EC=82=B0=EC=8B=9D=20=EA=B2=80=EC=A6=9D?= =?UTF-8?q?=20=EB=A1=9C=EC=A7=81=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/programmers/java/calculation/Operator.java | 2 +- .../java/validator/FormulaSplitValidator.java | 13 +++++++++++-- .../org/programmers/java/validator/Validator.java | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/programmers/java/calculation/Operator.java b/src/main/java/org/programmers/java/calculation/Operator.java index 33189120f..7ab50c1e1 100644 --- a/src/main/java/org/programmers/java/calculation/Operator.java +++ b/src/main/java/org/programmers/java/calculation/Operator.java @@ -25,7 +25,7 @@ private int getPriority() { return priority; } public static boolean comparePriorities(String firstSymbol, String secondSymbol){ - return Operator.isSymbol(firstSymbol).get().getPriority() > Operator.isSymbol(secondSymbol).get().getPriority(); + return Operator.isSymbol(firstSymbol).get().getPriority() < Operator.isSymbol(secondSymbol).get().getPriority(); } diff --git a/src/main/java/org/programmers/java/validator/FormulaSplitValidator.java b/src/main/java/org/programmers/java/validator/FormulaSplitValidator.java index 1f0fa4bb5..1d6649b34 100644 --- a/src/main/java/org/programmers/java/validator/FormulaSplitValidator.java +++ b/src/main/java/org/programmers/java/validator/FormulaSplitValidator.java @@ -18,27 +18,36 @@ public FormulaSplitValidator(Output output) { // 연산식 검증: 연산식 분해 후 하나씩 검증 public List validate(String formulaInput){ + formularAfterSplitValidate.clear(); String[] splitFormula = formulaInput.split(" "); for(String operatorOrOperand : splitFormula){ - splitValidateAddInList(operatorOrOperand); + if(!splitValidateAddInList(operatorOrOperand)){ + break; + } } return formularAfterSplitValidate; } - private void splitValidateAddInList(String operatorOrOperand){ + private boolean splitValidateAddInList(String operatorOrOperand){ if(Operator.isNumber(operatorOrOperand)) { formularAfterSplitValidate.add(operatorOrOperand); + return true; } if(Operator.isSymbol(operatorOrOperand).isPresent()) { formularAfterSplitValidate.add(operatorOrOperand); + return true; } if(!Operator.isNumber(operatorOrOperand) && !Operator.isSymbol(operatorOrOperand).isPresent()){ + System.out.println(operatorOrOperand); output.errorMsg(Error.CALCULATE_VALIDATION.getMsg()); formularAfterSplitValidate.clear(); + return false; } + + return true; } } diff --git a/src/main/java/org/programmers/java/validator/Validator.java b/src/main/java/org/programmers/java/validator/Validator.java index 8b54aab72..0b83bc45a 100644 --- a/src/main/java/org/programmers/java/validator/Validator.java +++ b/src/main/java/org/programmers/java/validator/Validator.java @@ -28,6 +28,7 @@ public boolean formulaValidate(String formulaInput) { } if(!isNormalFormula) { + System.out.println("에러"); output.errorMsg(Error.CALCULATE_VALIDATION.getMsg()); } From 31b2a60de0081153dbdcb308ab999cc81fce663f Mon Sep 17 00:00:00 2001 From: changhyeon Date: Mon, 12 Jun 2023 20:41:56 +0900 Subject: [PATCH 17/34] =?UTF-8?q?refactor:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EA=B0=9C=ED=96=89=20=EC=82=AD=EC=A0=9C,=20?= =?UTF-8?q?=ED=95=84=EC=9A=94=ED=95=98=EC=A7=80=20=EC=95=8A=EC=9D=80=20?= =?UTF-8?q?=EB=A9=94=EC=86=8C=EB=93=9C=20=EC=82=AD=EC=A0=9C,=20=EB=A9=94?= =?UTF-8?q?=EC=86=8C=EB=93=9C=20=EC=9C=84=EC=B9=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/programmers/java/message/FunctionSelect.java | 9 +++++---- src/main/java/org/programmers/java/message/Info.java | 2 +- .../java/validator/FormulaSplitValidator.java | 1 - .../java/org/programmers/java/validator/Validator.java | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/programmers/java/message/FunctionSelect.java b/src/main/java/org/programmers/java/message/FunctionSelect.java index 8c20d5d15..e1db8a85b 100644 --- a/src/main/java/org/programmers/java/message/FunctionSelect.java +++ b/src/main/java/org/programmers/java/message/FunctionSelect.java @@ -9,17 +9,18 @@ public enum FunctionSelect { EXIT("3. 종료", "3"), WRONGINPUT("입력값 에러", "4"); - public String getSelectNum() { - return selectNum; - } - private final String msg; private final String selectNum; + FunctionSelect(String msg, String selectNum) { this.msg = msg; this.selectNum = selectNum; } + public String getSelectNum() { + return selectNum; + } + public String getMsg() { return msg; } diff --git a/src/main/java/org/programmers/java/message/Info.java b/src/main/java/org/programmers/java/message/Info.java index 3321eb6bf..db7fad262 100644 --- a/src/main/java/org/programmers/java/message/Info.java +++ b/src/main/java/org/programmers/java/message/Info.java @@ -4,8 +4,8 @@ public enum Info { SELECT_NUM("선택 : "), EXIT_INFO("프로그램이 종료되었습니다"); - private final String msg; + Info(String msg) { this.msg = msg; } diff --git a/src/main/java/org/programmers/java/validator/FormulaSplitValidator.java b/src/main/java/org/programmers/java/validator/FormulaSplitValidator.java index 1d6649b34..8942e9a81 100644 --- a/src/main/java/org/programmers/java/validator/FormulaSplitValidator.java +++ b/src/main/java/org/programmers/java/validator/FormulaSplitValidator.java @@ -42,7 +42,6 @@ private boolean splitValidateAddInList(String operatorOrOperand){ } if(!Operator.isNumber(operatorOrOperand) && !Operator.isSymbol(operatorOrOperand).isPresent()){ - System.out.println(operatorOrOperand); output.errorMsg(Error.CALCULATE_VALIDATION.getMsg()); formularAfterSplitValidate.clear(); return false; diff --git a/src/main/java/org/programmers/java/validator/Validator.java b/src/main/java/org/programmers/java/validator/Validator.java index 0b83bc45a..8b54aab72 100644 --- a/src/main/java/org/programmers/java/validator/Validator.java +++ b/src/main/java/org/programmers/java/validator/Validator.java @@ -28,7 +28,6 @@ public boolean formulaValidate(String formulaInput) { } if(!isNormalFormula) { - System.out.println("에러"); output.errorMsg(Error.CALCULATE_VALIDATION.getMsg()); } From 8a56824031d5e32687ee0642739c000001e73acb Mon Sep 17 00:00:00 2001 From: changhyeon Date: Mon, 12 Jun 2023 23:59:54 +0900 Subject: [PATCH 18/34] =?UTF-8?q?refactor:=20Repository=20HashMap=EC=97=90?= =?UTF-8?q?=EC=84=9C=20Linked=20HashMap=EC=9C=BC=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD,=20save=20=EB=A6=AC=ED=84=B4=20=EA=B0=92=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=98=88=EC=99=B8=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/programmers/java/Calculator.java | 21 +++++++++++++++---- .../org/programmers/java/message/Error.java | 3 ++- .../repository/FormulaMemoryRepository.java | 6 ++++-- .../java/repository/FormulaRepository.java | 2 +- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/programmers/java/Calculator.java b/src/main/java/org/programmers/java/Calculator.java index 2f9fb6fa5..2cfc24acb 100644 --- a/src/main/java/org/programmers/java/Calculator.java +++ b/src/main/java/org/programmers/java/Calculator.java @@ -55,12 +55,25 @@ private FunctionSelect getFunctionSelectNumber(String selectNum) { } private void formulaCalculate() { - String formula = input.formulaInput(); + String inputFormula = input.formulaInput(); - if(validator.formulaValidate(formula)){ - String result = calculation.requestCalculate(formula); + if(validator.formulaValidate(inputFormula)){ + String result = calculation.requestCalculate(inputFormula); output.calculationValue(result); - formulaRepository.save(formula, result); + String getFormula = formulaRepository.save(inputFormula, result); + compareFormula(getFormula, inputFormula, result); + } + } + + private void compareFormula(String getFormula, String inputFormula, String result){ + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder + .append(inputFormula) + .append(" = ") + .append(result); + String formula = stringBuilder.toString(); + if(!getFormula.equals(formula)){ + output.errorMsg(Error.DOES_NOT_MATCH_DATA.getMsg()); } } } diff --git a/src/main/java/org/programmers/java/message/Error.java b/src/main/java/org/programmers/java/message/Error.java index c8b0a3a03..76f6f5a8c 100644 --- a/src/main/java/org/programmers/java/message/Error.java +++ b/src/main/java/org/programmers/java/message/Error.java @@ -2,7 +2,8 @@ public enum Error { CALCULATE_VALIDATION("잘못된 연산식이 입력되었습니다. 형식을 맞춰주세요. ex) 2 + 4 ..."), - SELECT_VALIDATION("선택된 번호는 존재하지 않습니다. 1-3 사이의 숫자를 선택해주세요"); + SELECT_VALIDATION("선택된 번호는 존재하지 않습니다. 1-3 사이의 숫자를 선택해주세요"), + DOES_NOT_MATCH_DATA("입력한 연산식과 결과가 저장한 연산식과 결과랑 다릅니다."); private final String msg; diff --git a/src/main/java/org/programmers/java/repository/FormulaMemoryRepository.java b/src/main/java/org/programmers/java/repository/FormulaMemoryRepository.java index 5580604f2..06174cdca 100644 --- a/src/main/java/org/programmers/java/repository/FormulaMemoryRepository.java +++ b/src/main/java/org/programmers/java/repository/FormulaMemoryRepository.java @@ -1,20 +1,22 @@ package org.programmers.java.repository; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; public class FormulaMemoryRepository implements FormulaRepository { - Map formulaMap = new HashMap<>(); + Map formulaMap = new LinkedHashMap<>(); private Long num = 0L; @Override - public void save(String formula, String caculateValue) { + public String save(String formula, String caculateValue) { StringBuilder stringBuilder = new StringBuilder(formula); stringBuilder.append(" = "); stringBuilder.append(caculateValue); formulaMap.put(num++, stringBuilder.toString()); + return formulaMap.get(num-1); } @Override diff --git a/src/main/java/org/programmers/java/repository/FormulaRepository.java b/src/main/java/org/programmers/java/repository/FormulaRepository.java index 49777efc6..05e3c49ea 100644 --- a/src/main/java/org/programmers/java/repository/FormulaRepository.java +++ b/src/main/java/org/programmers/java/repository/FormulaRepository.java @@ -4,6 +4,6 @@ import java.util.Map; public interface FormulaRepository { - void save(String formula, String caculateValue); + String save(String formula, String caculateValue); Map getFormulaList(); } From 0abccaa20f968dfc0f3b4a7ba1f5c25a0092bacf Mon Sep 17 00:00:00 2001 From: changhyeon Date: Tue, 13 Jun 2023 15:09:16 +0900 Subject: [PATCH 19/34] =?UTF-8?q?refactor:=20=EA=B0=9D=EC=B2=B4=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=EC=8B=9C=20=EC=9D=B8=EC=8A=A4=ED=84=B4?= =?UTF-8?q?=EC=8A=A4=20=EB=A7=A4=EA=B0=9C=EB=B3=80=EC=88=98=202=EA=B0=9C?= =?UTF-8?q?=20=EC=9D=B4=ED=95=98=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/programmers/java/App.java | 8 ++------ src/main/java/org/programmers/java/Calculator.java | 9 +++++---- .../org/programmers/java/calculation/Calculation.java | 6 +++--- .../java/org/programmers/java/calculation/Operator.java | 1 + .../java/validator/FormulaSplitValidator.java | 5 +++-- .../java/org/programmers/java/validator/Validator.java | 7 ++++--- src/test/java/org/programmers/java/ValidaionTest.java | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/programmers/java/App.java b/src/main/java/org/programmers/java/App.java index fd3dd5b6b..c002f77a1 100644 --- a/src/main/java/org/programmers/java/App.java +++ b/src/main/java/org/programmers/java/App.java @@ -10,13 +10,9 @@ public class App { public static void main(String[] args){ - Console console = Console.getInstance(); - InfixToPostfixConverter infixToPostfixConverter = new InfixToPostfixConverter(); - PostfixCalculation postfixCalculation = new PostfixCalculation(); - Calculation calculation = new Calculation(infixToPostfixConverter, postfixCalculation); + Calculation calculation = new Calculation(); FormulaRepository formulaRepository = new FormulaMemoryRepository(); - Validator validator = new Validator(console); - Calculator calculator = new Calculator(console, console, calculation, formulaRepository, validator); + Calculator calculator = new Calculator(calculation, formulaRepository); calculator.run(); } } diff --git a/src/main/java/org/programmers/java/Calculator.java b/src/main/java/org/programmers/java/Calculator.java index 2cfc24acb..28c601f5a 100644 --- a/src/main/java/org/programmers/java/Calculator.java +++ b/src/main/java/org/programmers/java/Calculator.java @@ -1,6 +1,7 @@ package org.programmers.java; import org.programmers.java.calculation.Calculation; +import org.programmers.java.console.Console; import org.programmers.java.console.Input; import org.programmers.java.console.Output; import org.programmers.java.message.Error; @@ -18,12 +19,12 @@ public class Calculator { private final FormulaRepository formulaRepository; private final Validator validator; - Calculator(Input input, Output output, Calculation calculation, FormulaRepository formulaRepository, Validator validator){ - this.input = input; - this.output = output; + Calculator(Calculation calculation, FormulaRepository formulaRepository){ + this.input = Console.getInstance(); + this.output = Console.getInstance(); this.calculation = calculation; this.formulaRepository = formulaRepository; - this.validator = validator; + this.validator = new Validator(); } void run() { diff --git a/src/main/java/org/programmers/java/calculation/Calculation.java b/src/main/java/org/programmers/java/calculation/Calculation.java index 232c788d3..517d534fa 100644 --- a/src/main/java/org/programmers/java/calculation/Calculation.java +++ b/src/main/java/org/programmers/java/calculation/Calculation.java @@ -7,9 +7,9 @@ public class Calculation { private final InfixToPostfixConverter infixToPostfixConverter; private final PostfixCalculation postfixCalculation; - public Calculation(InfixToPostfixConverter infixToPostfixConverter, PostfixCalculation postfixCalculation) { - this.infixToPostfixConverter = infixToPostfixConverter; - this.postfixCalculation = postfixCalculation; + public Calculation() { + this.infixToPostfixConverter = new InfixToPostfixConverter(); + this.postfixCalculation = new PostfixCalculation(); } public String requestCalculate(String inputFormula){ diff --git a/src/main/java/org/programmers/java/calculation/Operator.java b/src/main/java/org/programmers/java/calculation/Operator.java index 7ab50c1e1..ba27a6283 100644 --- a/src/main/java/org/programmers/java/calculation/Operator.java +++ b/src/main/java/org/programmers/java/calculation/Operator.java @@ -24,6 +24,7 @@ public enum Operator { private int getPriority() { return priority; } + public static boolean comparePriorities(String firstSymbol, String secondSymbol){ return Operator.isSymbol(firstSymbol).get().getPriority() < Operator.isSymbol(secondSymbol).get().getPriority(); diff --git a/src/main/java/org/programmers/java/validator/FormulaSplitValidator.java b/src/main/java/org/programmers/java/validator/FormulaSplitValidator.java index 8942e9a81..e4bccd840 100644 --- a/src/main/java/org/programmers/java/validator/FormulaSplitValidator.java +++ b/src/main/java/org/programmers/java/validator/FormulaSplitValidator.java @@ -1,6 +1,7 @@ package org.programmers.java.validator; import org.programmers.java.calculation.Operator; +import org.programmers.java.console.Console; import org.programmers.java.console.Output; import org.programmers.java.message.Error; @@ -12,8 +13,8 @@ public class FormulaSplitValidator { private final Output output; private List formularAfterSplitValidate = new ArrayList<>(); - public FormulaSplitValidator(Output output) { - this.output = output; + public FormulaSplitValidator() { + this.output = Console.getInstance(); } // 연산식 검증: 연산식 분해 후 하나씩 검증 diff --git a/src/main/java/org/programmers/java/validator/Validator.java b/src/main/java/org/programmers/java/validator/Validator.java index 8b54aab72..5128126aa 100644 --- a/src/main/java/org/programmers/java/validator/Validator.java +++ b/src/main/java/org/programmers/java/validator/Validator.java @@ -1,5 +1,6 @@ package org.programmers.java.validator; +import org.programmers.java.console.Console; import org.programmers.java.console.Output; import org.programmers.java.message.Error; @@ -11,10 +12,10 @@ public class Validator { private final FormulaCountValidator formulaCountValidator; private final FormulaSplitValidator formulaSplitValidator; - public Validator(Output output) { - this.output = output; + public Validator() { + this.output = Console.getInstance(); this.formulaCountValidator = new FormulaCountValidator(); - this.formulaSplitValidator = new FormulaSplitValidator(output); + this.formulaSplitValidator = new FormulaSplitValidator(); } // 연산식 검증 로직 diff --git a/src/test/java/org/programmers/java/ValidaionTest.java b/src/test/java/org/programmers/java/ValidaionTest.java index fa6d4aeee..776834c91 100644 --- a/src/test/java/org/programmers/java/ValidaionTest.java +++ b/src/test/java/org/programmers/java/ValidaionTest.java @@ -14,7 +14,7 @@ public class ValidaionTest { - FormulaSplitValidator formulaSplitValidator = new FormulaSplitValidator(Console.getInstance()); + FormulaSplitValidator formulaSplitValidator = new FormulaSplitValidator(); FormulaCountValidator formulaCountValidator = new FormulaCountValidator(); @Test From f65cd56a93b5071c95e8d643e7660c0f5de8bc51 Mon Sep 17 00:00:00 2001 From: changhyeon Date: Wed, 14 Jun 2023 01:06:37 +0900 Subject: [PATCH 20/34] =?UTF-8?q?refactor:=20Assertions=20import=20?= =?UTF-8?q?=EC=9E=91=EC=97=85,=20ParameterizedTest=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/programmers/java/CalculationTest.java | 47 ++++++++++++------- .../org/programmers/java/OperatorTest.java | 10 ++-- .../org/programmers/java/RepositoryTest.java | 16 +++---- .../org/programmers/java/ValidaionTest.java | 47 +++++++++++++------ 4 files changed, 78 insertions(+), 42 deletions(-) diff --git a/src/test/java/org/programmers/java/CalculationTest.java b/src/test/java/org/programmers/java/CalculationTest.java index a7f32b6cc..621145e7c 100644 --- a/src/test/java/org/programmers/java/CalculationTest.java +++ b/src/test/java/org/programmers/java/CalculationTest.java @@ -3,44 +3,59 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.programmers.java.calculation.Calculation; import org.programmers.java.calculation.InfixToPostfixConverter; import org.programmers.java.calculation.PostfixCalculation; import java.util.Arrays; import java.util.List; +import java.util.stream.Stream; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class CalculationTest { InfixToPostfixConverter infixToPostfixConverter = new InfixToPostfixConverter(); PostfixCalculation postfixCalculation = new PostfixCalculation(); - @Test - @DisplayName("중위 표기식 -> 후위 표기식 변경") - void infixToPostfix(){ - // given - String[] formulaList = {"3", "+", "5", "*", "10"}; - List postfixExpect = Arrays.asList("3","5","10","*","+"); - + @ParameterizedTest + @DisplayName("중위 표기식 -> 후위 표기식") + @MethodSource("makeFormulaAndPostfix") + void infixToPostfix(List expectPostfix, String[] formula){ // when - List postfix = infixToPostfixConverter.convert(formulaList); + List postfix = infixToPostfixConverter.convert(formula); // then - Assertions.assertEquals(postfixExpect, postfix); + assertEquals(expectPostfix, postfix); } - @Test - @DisplayName("후위 표기식으로 연산하기") - void postfixCalculate(){ - // given - List postfix = Arrays.asList("3","5","10","*","+"); + static Stream makeFormulaAndPostfix() { + return Stream.of( + Arguments.of(Arrays.asList("3", "5", "10", "*", "+"), new String[]{"3","+","5","*","10"}), + Arguments.of(Arrays.asList("3", "5", "10", "-", "+"), new String[]{"3","+","5","-","10"}), + Arguments.of(Arrays.asList("3", "10", "5", "/", "+"), new String[]{"3","+","10","/","5"}) + ); + } + @ParameterizedTest + @DisplayName("후위 표기식으로 연산하기") + @MethodSource("makePostfixList") + void postfixCalculate(List postfix, String result) { // when String calculateValue = postfixCalculation.calculate(postfix); // then - Assertions.assertEquals("53", calculateValue); + assertEquals(result, calculateValue); } - + static Stream makePostfixList() { + return Stream.of( + Arguments.of(Arrays.asList("3", "5", "10", "*", "+"), "53"), + Arguments.of(Arrays.asList("3", "5", "10", "-", "+"), "-2"), + Arguments.of(Arrays.asList("3", "10", "5", "/", "+"), "5") + ); + } } diff --git a/src/test/java/org/programmers/java/OperatorTest.java b/src/test/java/org/programmers/java/OperatorTest.java index 1b69d5453..1ece543be 100644 --- a/src/test/java/org/programmers/java/OperatorTest.java +++ b/src/test/java/org/programmers/java/OperatorTest.java @@ -5,14 +5,16 @@ import org.junit.jupiter.api.Test; import org.programmers.java.calculation.Operator; +import static org.junit.jupiter.api.Assertions.*; + public class OperatorTest { @Test @DisplayName("사칙연산 테스트") void operatorCalculate(){ - Assertions.assertEquals(10, Operator.arithmeticExpression("+", 5, 5)); - Assertions.assertEquals(3, Operator.arithmeticExpression("-", 5, 2)); - Assertions.assertEquals(30, Operator.arithmeticExpression("*", 10, 3)); - Assertions.assertEquals(5, Operator.arithmeticExpression("/", 40, 8)); + assertEquals(10, Operator.arithmeticExpression("+", 5, 5)); + assertEquals(3, Operator.arithmeticExpression("-", 5, 2)); + assertEquals(30, Operator.arithmeticExpression("*", 10, 3)); + assertEquals(5, Operator.arithmeticExpression("/", 40, 8)); } } diff --git a/src/test/java/org/programmers/java/RepositoryTest.java b/src/test/java/org/programmers/java/RepositoryTest.java index 8f1a0d472..25b5f0c54 100644 --- a/src/test/java/org/programmers/java/RepositoryTest.java +++ b/src/test/java/org/programmers/java/RepositoryTest.java @@ -3,27 +3,27 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; import org.programmers.java.repository.FormulaMemoryRepository; import org.programmers.java.repository.FormulaRepository; import java.util.Map; -public class RepositoryTest { +import static org.junit.jupiter.api.Assertions.assertEquals; +public class RepositoryTest { FormulaRepository formulaRepository = new FormulaMemoryRepository(); - @Test + @ParameterizedTest @DisplayName("연산식과 결과 저장소에 저장") - void save(){ - // given - String formula = "3 + 6 / 2"; - String result = "6"; - + @CsvSource(value={"3 + 6 / 2 : 6", "10 / 2 * 5 - 3 : 22"}, delimiter = ':') + void save(String formula, String result){ // when formulaRepository.save(formula, result); // then - Assertions.assertEquals(formula + " = " + result, formulaRepository.getFormulaList().get(0L)); + assertEquals(formula + " = " + result, formulaRepository.getFormulaList().get(0L)); } @Test diff --git a/src/test/java/org/programmers/java/ValidaionTest.java b/src/test/java/org/programmers/java/ValidaionTest.java index 776834c91..b0b58188b 100644 --- a/src/test/java/org/programmers/java/ValidaionTest.java +++ b/src/test/java/org/programmers/java/ValidaionTest.java @@ -3,6 +3,10 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.junit.jupiter.params.provider.ValueSource; import org.programmers.java.console.Console; import org.programmers.java.validator.FormulaCountValidator; import org.programmers.java.validator.FormulaSplitValidator; @@ -10,6 +14,9 @@ import java.util.Arrays; import java.util.List; +import java.util.stream.Stream; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class ValidaionTest { @@ -17,30 +24,42 @@ public class ValidaionTest { FormulaSplitValidator formulaSplitValidator = new FormulaSplitValidator(); FormulaCountValidator formulaCountValidator = new FormulaCountValidator(); - @Test + @ParameterizedTest @DisplayName("연산식 검증: 연산식 분해 검증") - void formulaSplitValidation(){ - // given - String inputMsg = "10 + 4 / 20 * 3 - 2"; - List formulaTest = Arrays.asList("10", "+", "4", "/", "20", "*", "3", "-", "2"); - + @MethodSource("makeFormulaAndList") + void formulaSplitValidation(String input, List formula){ // when - List formulaList = formulaSplitValidator.validate(inputMsg); + List formulaList = formulaSplitValidator.validate(input); // then - Assertions.assertEquals(formulaList, formulaTest); + assertEquals(formula, formulaList); } - @Test - @DisplayName("연산식 검증: 연산자와 피연산자의 전체 개수 검증 및 위치 검증") - void checkFormulaValidation(){ - // given - List formulaList = Arrays.asList("10", "+", "4", "/", "20", "*", "3", "-", "2"); + static Stream makeFormulaAndList(){ + return Stream.of( + Arguments.of("10 + 4 / 20 * 3 - 2", Arrays.asList("10", "+", "4", "/", "20", "*", "3", "-", "2")), + Arguments.of("5 - 2 * 20 + 3 / 2", Arrays.asList("5","-","2","*","20","+","3","/","2")), + Arguments.of("7 * 2 - 3 / 3 + 2", Arrays.asList("7","*","2","-","3","/","3","+","2")) + ); + } + + @ParameterizedTest + @DisplayName("연산식 검증: 연산자와 피연산자의 전체 개수 검증 및 위치 검증") + @MethodSource("makeFormulaList") + void checkFormulaValidation(List formulaList){ // when Boolean checkedFormulaValidation = formulaCountValidator.validate(formulaList); // then - Assertions.assertEquals(checkedFormulaValidation, true); + assertEquals(checkedFormulaValidation, true); + } + + static Stream makeFormulaList(){ + return Stream.of( + Arguments.of(Arrays.asList("10", "+", "4", "/", "20", "*", "3", "-", "2")), + Arguments.of(Arrays.asList("5","-","2","*","20","+","3","/","2")), + Arguments.of(Arrays.asList("7","*","2","-","3","/","3","+","2")) + ); } } From 6e8064a42c2e754c8d9e0aeb9becfdd830326c66 Mon Sep 17 00:00:00 2001 From: changhyeon Date: Wed, 14 Jun 2023 01:44:40 +0900 Subject: [PATCH 21/34] =?UTF-8?q?feat:=20=EC=9A=94=EA=B5=AC=20=EC=82=AC?= =?UTF-8?q?=ED=95=AD=20=EB=B6=84=EC=84=9D=20=EB=B0=8F=20=EA=B5=AC=ED=98=84?= =?UTF-8?q?=20=EB=82=B4=EC=9A=A9=20README=20file=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/programmers/java/docs/README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/java/org/programmers/java/docs/README.md diff --git a/src/main/java/org/programmers/java/docs/README.md b/src/main/java/org/programmers/java/docs/README.md new file mode 100644 index 000000000..e69de29bb From 16861fdf63dc81acc1ff43c671c4c850aa8e8b90 Mon Sep 17 00:00:00 2001 From: changhyeon Date: Wed, 14 Jun 2023 01:45:54 +0900 Subject: [PATCH 22/34] =?UTF-8?q?refactor:=20=EC=9A=94=EA=B5=AC=EC=82=AC?= =?UTF-8?q?=ED=95=AD=20=EB=B6=84=EC=84=9D=20=EB=B0=8F=20=EA=B5=AC=ED=98=84?= =?UTF-8?q?=20=EB=82=B4=EC=9A=A9=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/programmers/java/docs/README.md | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/src/main/java/org/programmers/java/docs/README.md b/src/main/java/org/programmers/java/docs/README.md index e69de29bb..97faf80e5 100644 --- a/src/main/java/org/programmers/java/docs/README.md +++ b/src/main/java/org/programmers/java/docs/README.md @@ -0,0 +1,67 @@ +## 요구 사항 분석 및 구현 내용 +

+ +### 콘솔 + +> - 입력과 출력을 하는 기능 +> - 추후 GUI로 변경 가능성이 있을 수 있기 때문에 Interface로 작성 + + +**입력** + +- 조회, 연산, 종료의 기능을 하는 메뉴 선택 입력 +- 연산시 필요한 연산식 입력 + +**출력** + +- 메뉴 메시지 출력 +- 메뉴 선택 메시지 출력 +- 연산식 출력 +- 에러 메시지 출력 +- 연산식, 연산 값 출력 +- 저장된 연산식 리스트 출력(조회 기능) +- 종료 메시지 출력 + +### 검증 + +> 입력된 연산식에 대한 검증 기능 +> + +**연산식 분해** + +- 연산식 분해 후 분해된 문자가 피연산자 또는 연산자인지 판단 + +**연산자와 피연산자의 전체 개수 검증 및 위치 검증** + +- 정상적으로 분해된 연산식 리스트의 경우 피연산자는 짝수, 연산자는 홀수 인덱스에 있는 것으로 판단한다. + + + +### 연산 + +> 입력된 연산식에 대한 연산 기능 +> + +**중위표기법에서 후위표기법** + +- 입력된 연산식에 대한 우선순위를 판별해야하므로 중위표기법에서 후위표기법으로 변경 + +**후위표기법 계산** + +- 후위표기법으로 된 연산식 계산 + +### 저장소 + +> - 입력된 연산식과 결과 값 저장, 조회 기능 +> - 추후 인메모리가 아닌 다른 DB를 사용하기 위해 Interface로 생성 + + +**저장** + +- “index번호“를 key로 “연산식 = 결과값”를 value로 저장 + - “연산식” : “결과값” 으로 저장하는 경우 HashMap의 특성상 같은 키 값을 넣을 수 없기 때문에 중복된 연산식이 들어오는 경우 하나로 나타날 수 있기 때문에 Index번호를 Key로 작성 +- 순서의 보장을 위해 LinkedHashMap으로 변경 + +**조회** + +- 저장된 연산식과 값을 리스트로 불러와 출력 \ No newline at end of file From 76a6b0334f7813cdc4352088d9c213dc0185e322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=99=A9=EC=B0=BD=ED=98=84?= Date: Wed, 14 Jun 2023 02:00:44 +0900 Subject: [PATCH 23/34] =?UTF-8?q?refactor:=20README=20=EA=B0=80=EB=8F=85?= =?UTF-8?q?=EC=84=B1=EC=9D=84=20=EC=9C=84=ED=95=B4=20=EC=96=91=EC=8B=9D=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/programmers/java/docs/README.md | 47 +++++++++---------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/src/main/java/org/programmers/java/docs/README.md b/src/main/java/org/programmers/java/docs/README.md index 97faf80e5..7ee96d5d0 100644 --- a/src/main/java/org/programmers/java/docs/README.md +++ b/src/main/java/org/programmers/java/docs/README.md @@ -1,19 +1,17 @@ ## 요구 사항 분석 및 구현 내용
- ### 콘솔 > - 입력과 출력을 하는 기능 > - 추후 GUI로 변경 가능성이 있을 수 있기 때문에 Interface로 작성 +> - -**입력** - +```markdown +입력 - 조회, 연산, 종료의 기능을 하는 메뉴 선택 입력 - 연산시 필요한 연산식 입력 -**출력** - +출력 - 메뉴 메시지 출력 - 메뉴 선택 메시지 출력 - 연산식 출력 @@ -21,47 +19,46 @@ - 연산식, 연산 값 출력 - 저장된 연산식 리스트 출력(조회 기능) - 종료 메시지 출력 +``` ### 검증 > 입력된 연산식에 대한 검증 기능 -> - -**연산식 분해** +> +```markdown +연산식 분해 - 연산식 분해 후 분해된 문자가 피연산자 또는 연산자인지 판단 -**연산자와 피연산자의 전체 개수 검증 및 위치 검증** - +연산자와 피연산자의 전체 개수 검증 및 위치 검증 - 정상적으로 분해된 연산식 리스트의 경우 피연산자는 짝수, 연산자는 홀수 인덱스에 있는 것으로 판단한다. - - +``` ### 연산 > 입력된 연산식에 대한 연산 기능 -> - -**중위표기법에서 후위표기법** +> +```markdown +중위표기법에서 후위표기법 - 입력된 연산식에 대한 우선순위를 판별해야하므로 중위표기법에서 후위표기법으로 변경 -**후위표기법 계산** - +후위표기법 계산 - 후위표기법으로 된 연산식 계산 +``` ### 저장소 -> - 입력된 연산식과 결과 값 저장, 조회 기능 +> - 입력된 연산식과 결과 값 저장, 조회 기능 > - 추후 인메모리가 아닌 다른 DB를 사용하기 위해 Interface로 생성 +> - -**저장** - +```markdown +저장 - “index번호“를 key로 “연산식 = 결과값”를 value로 저장 - “연산식” : “결과값” 으로 저장하는 경우 HashMap의 특성상 같은 키 값을 넣을 수 없기 때문에 중복된 연산식이 들어오는 경우 하나로 나타날 수 있기 때문에 Index번호를 Key로 작성 - 순서의 보장을 위해 LinkedHashMap으로 변경 -**조회** - -- 저장된 연산식과 값을 리스트로 불러와 출력 \ No newline at end of file +조회 +- 저장된 연산식과 값을 리스트로 불러와 출력 +``` From 6d768d948d83fc4b7a815ecfb413610854438843 Mon Sep 17 00:00:00 2001 From: changhyeon Date: Wed, 14 Jun 2023 13:27:20 +0900 Subject: [PATCH 24/34] =?UTF-8?q?refactor:=200=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=82=98=EB=88=B4=EC=9D=84=20=EB=95=8C=20=EC=98=88=EC=99=B8?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EC=B6=94=EA=B0=80,=20=EC=98=88=EC=99=B8?= =?UTF-8?q?=20=EC=B2=98=EB=A6=AC=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/programmers/java/calculation/Operator.java | 6 ++++++ .../java/calculation/PostfixCalculation.java | 1 + .../java/org/programmers/java/CalculationTest.java | 12 ++++++++++++ 3 files changed, 19 insertions(+) diff --git a/src/main/java/org/programmers/java/calculation/Operator.java b/src/main/java/org/programmers/java/calculation/Operator.java index ba27a6283..631b5d2ca 100644 --- a/src/main/java/org/programmers/java/calculation/Operator.java +++ b/src/main/java/org/programmers/java/calculation/Operator.java @@ -44,4 +44,10 @@ public static Optional isSymbol(String inputSymbol){ public static boolean isNumber(String inputNumber){ return Pattern.matches("[0-9]+",inputNumber); } + + public static void checkDivideZero(String symbol, int secondOperand){ + if(symbol.equals("/") && secondOperand == 0){ + throw new IllegalArgumentException("0으로 나눌 수 없습니다"); + } + } } diff --git a/src/main/java/org/programmers/java/calculation/PostfixCalculation.java b/src/main/java/org/programmers/java/calculation/PostfixCalculation.java index 3659fa906..634e60c4c 100644 --- a/src/main/java/org/programmers/java/calculation/PostfixCalculation.java +++ b/src/main/java/org/programmers/java/calculation/PostfixCalculation.java @@ -27,6 +27,7 @@ private void calculationResultAddInStack(String operatorOrOperand) { int num2 = Integer.parseInt(numberDeque.removeLast()); int num1 = Integer.parseInt(numberDeque.removeLast()); + Operator.checkDivideZero(operatorOrOperand, num2); numberDeque.add(String.valueOf(Operator.arithmeticExpression(operatorOrOperand, num1, num2))); } } diff --git a/src/test/java/org/programmers/java/CalculationTest.java b/src/test/java/org/programmers/java/CalculationTest.java index 621145e7c..ba7422b7e 100644 --- a/src/test/java/org/programmers/java/CalculationTest.java +++ b/src/test/java/org/programmers/java/CalculationTest.java @@ -8,6 +8,7 @@ import org.junit.jupiter.params.provider.MethodSource; import org.programmers.java.calculation.Calculation; import org.programmers.java.calculation.InfixToPostfixConverter; +import org.programmers.java.calculation.Operator; import org.programmers.java.calculation.PostfixCalculation; import java.util.Arrays; @@ -15,6 +16,7 @@ import java.util.stream.Stream; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; public class CalculationTest { @@ -58,4 +60,14 @@ static Stream makePostfixList() { Arguments.of(Arrays.asList("3", "10", "5", "/", "+"), "5") ); } + + @Test + @DisplayName("0으로 나눌 때 예외가 발생") + void checkZeroDivide() { + // given + String operator = "/"; + + // when, then + assertThrows(IllegalArgumentException.class, () -> Operator.checkDivideZero(operator,0)); + } } From 5385e9ab856f2b998271a4a11b2874aa8a4c15b5 Mon Sep 17 00:00:00 2001 From: changhyeon Date: Wed, 14 Jun 2023 13:40:25 +0900 Subject: [PATCH 25/34] =?UTF-8?q?refactor:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EA=B0=9C=ED=96=89=20=EC=82=AD=EC=A0=9C,=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20imp?= =?UTF-8?q?ort=EB=AC=B8=20=EC=82=AD=EC=A0=9C,=20=EA=B0=9C=ED=96=89=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/programmers/java/App.java | 4 ---- src/main/java/org/programmers/java/Calculator.java | 2 -- .../org/programmers/java/calculation/Calculation.java | 1 - .../java/calculation/InfixToPostfixConverter.java | 1 + .../java/org/programmers/java/calculation/Operator.java | 2 -- src/main/java/org/programmers/java/console/Console.java | 1 - src/main/java/org/programmers/java/docs/README.md | 1 + .../java/repository/FormulaMemoryRepository.java | 3 --- .../programmers/java/repository/FormulaRepository.java | 1 - .../programmers/java/validator/FormulaSplitValidator.java | 1 - .../java/org/programmers/java/validator/Validator.java | 1 - src/test/java/org/programmers/java/CalculationTest.java | 3 --- src/test/java/org/programmers/java/OperatorTest.java | 1 - src/test/java/org/programmers/java/ValidaionTest.java | 8 -------- 14 files changed, 2 insertions(+), 28 deletions(-) diff --git a/src/main/java/org/programmers/java/App.java b/src/main/java/org/programmers/java/App.java index c002f77a1..1942b3b78 100644 --- a/src/main/java/org/programmers/java/App.java +++ b/src/main/java/org/programmers/java/App.java @@ -1,12 +1,8 @@ package org.programmers.java; import org.programmers.java.calculation.Calculation; -import org.programmers.java.calculation.InfixToPostfixConverter; -import org.programmers.java.calculation.PostfixCalculation; -import org.programmers.java.console.Console; import org.programmers.java.repository.FormulaRepository; import org.programmers.java.repository.FormulaMemoryRepository; -import org.programmers.java.validator.Validator; public class App { public static void main(String[] args){ diff --git a/src/main/java/org/programmers/java/Calculator.java b/src/main/java/org/programmers/java/Calculator.java index 28c601f5a..d174e1d98 100644 --- a/src/main/java/org/programmers/java/Calculator.java +++ b/src/main/java/org/programmers/java/Calculator.java @@ -9,8 +9,6 @@ import org.programmers.java.repository.FormulaRepository; import org.programmers.java.validator.Validator; -import java.util.Optional; - public class Calculator { private boolean programStatus = true; private final Input input; diff --git a/src/main/java/org/programmers/java/calculation/Calculation.java b/src/main/java/org/programmers/java/calculation/Calculation.java index 517d534fa..58041dfd8 100644 --- a/src/main/java/org/programmers/java/calculation/Calculation.java +++ b/src/main/java/org/programmers/java/calculation/Calculation.java @@ -3,7 +3,6 @@ import java.util.*; public class Calculation { - private final InfixToPostfixConverter infixToPostfixConverter; private final PostfixCalculation postfixCalculation; diff --git a/src/main/java/org/programmers/java/calculation/InfixToPostfixConverter.java b/src/main/java/org/programmers/java/calculation/InfixToPostfixConverter.java index 156431ff8..26a8aeda3 100644 --- a/src/main/java/org/programmers/java/calculation/InfixToPostfixConverter.java +++ b/src/main/java/org/programmers/java/calculation/InfixToPostfixConverter.java @@ -14,6 +14,7 @@ public List convert(String[] formulaList){ operandAddInPostfix(operatorOrOperand); checkOperatorToAddPostfix(operatorOrOperand); } + while(operatorDeque.size() > 0){ postfixOperator.add(operatorDeque.removeLast()); } diff --git a/src/main/java/org/programmers/java/calculation/Operator.java b/src/main/java/org/programmers/java/calculation/Operator.java index 631b5d2ca..7b760ccd2 100644 --- a/src/main/java/org/programmers/java/calculation/Operator.java +++ b/src/main/java/org/programmers/java/calculation/Operator.java @@ -15,7 +15,6 @@ public enum Operator { private final int priority; private final BiFunction expression; - Operator(String symbol, int priority, BiFunction expression){ this.symbol = symbol; this.priority = priority; @@ -34,7 +33,6 @@ public static int arithmeticExpression(String symbol, int firstOperand, int seco return isSymbol(symbol).get().expression.apply(firstOperand, secondOperand); } - public static Optional isSymbol(String inputSymbol){ return Arrays.stream(values()) .filter(operator -> operator.symbol.equals(inputSymbol)) diff --git a/src/main/java/org/programmers/java/console/Console.java b/src/main/java/org/programmers/java/console/Console.java index 5b2c39c98..1a7165ff2 100644 --- a/src/main/java/org/programmers/java/console/Console.java +++ b/src/main/java/org/programmers/java/console/Console.java @@ -7,7 +7,6 @@ import java.util.Scanner; public class Console implements Input, Output { - private final Scanner scanner = new Scanner(System.in); private Console() {} diff --git a/src/main/java/org/programmers/java/docs/README.md b/src/main/java/org/programmers/java/docs/README.md index 7ee96d5d0..14f8ccf78 100644 --- a/src/main/java/org/programmers/java/docs/README.md +++ b/src/main/java/org/programmers/java/docs/README.md @@ -38,6 +38,7 @@ > 입력된 연산식에 대한 연산 기능 > +> ```markdown 중위표기법에서 후위표기법 diff --git a/src/main/java/org/programmers/java/repository/FormulaMemoryRepository.java b/src/main/java/org/programmers/java/repository/FormulaMemoryRepository.java index 06174cdca..8fe6de12f 100644 --- a/src/main/java/org/programmers/java/repository/FormulaMemoryRepository.java +++ b/src/main/java/org/programmers/java/repository/FormulaMemoryRepository.java @@ -1,10 +1,7 @@ package org.programmers.java.repository; -import java.util.HashMap; import java.util.LinkedHashMap; -import java.util.List; import java.util.Map; -import java.util.stream.Collectors; public class FormulaMemoryRepository implements FormulaRepository { Map formulaMap = new LinkedHashMap<>(); diff --git a/src/main/java/org/programmers/java/repository/FormulaRepository.java b/src/main/java/org/programmers/java/repository/FormulaRepository.java index 05e3c49ea..128fd7422 100644 --- a/src/main/java/org/programmers/java/repository/FormulaRepository.java +++ b/src/main/java/org/programmers/java/repository/FormulaRepository.java @@ -1,6 +1,5 @@ package org.programmers.java.repository; -import java.util.List; import java.util.Map; public interface FormulaRepository { diff --git a/src/main/java/org/programmers/java/validator/FormulaSplitValidator.java b/src/main/java/org/programmers/java/validator/FormulaSplitValidator.java index e4bccd840..5f44d067f 100644 --- a/src/main/java/org/programmers/java/validator/FormulaSplitValidator.java +++ b/src/main/java/org/programmers/java/validator/FormulaSplitValidator.java @@ -9,7 +9,6 @@ import java.util.List; public class FormulaSplitValidator { - private final Output output; private List formularAfterSplitValidate = new ArrayList<>(); diff --git a/src/main/java/org/programmers/java/validator/Validator.java b/src/main/java/org/programmers/java/validator/Validator.java index 5128126aa..996fc66c2 100644 --- a/src/main/java/org/programmers/java/validator/Validator.java +++ b/src/main/java/org/programmers/java/validator/Validator.java @@ -4,7 +4,6 @@ import org.programmers.java.console.Output; import org.programmers.java.message.Error; -import java.util.ArrayList; import java.util.List; public class Validator { diff --git a/src/test/java/org/programmers/java/CalculationTest.java b/src/test/java/org/programmers/java/CalculationTest.java index ba7422b7e..64b763406 100644 --- a/src/test/java/org/programmers/java/CalculationTest.java +++ b/src/test/java/org/programmers/java/CalculationTest.java @@ -1,12 +1,10 @@ package org.programmers.java; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.programmers.java.calculation.Calculation; import org.programmers.java.calculation.InfixToPostfixConverter; import org.programmers.java.calculation.Operator; import org.programmers.java.calculation.PostfixCalculation; @@ -19,7 +17,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows; public class CalculationTest { - InfixToPostfixConverter infixToPostfixConverter = new InfixToPostfixConverter(); PostfixCalculation postfixCalculation = new PostfixCalculation(); diff --git a/src/test/java/org/programmers/java/OperatorTest.java b/src/test/java/org/programmers/java/OperatorTest.java index 1ece543be..24065d046 100644 --- a/src/test/java/org/programmers/java/OperatorTest.java +++ b/src/test/java/org/programmers/java/OperatorTest.java @@ -8,7 +8,6 @@ import static org.junit.jupiter.api.Assertions.*; public class OperatorTest { - @Test @DisplayName("사칙연산 테스트") void operatorCalculate(){ diff --git a/src/test/java/org/programmers/java/ValidaionTest.java b/src/test/java/org/programmers/java/ValidaionTest.java index b0b58188b..06e74e78c 100644 --- a/src/test/java/org/programmers/java/ValidaionTest.java +++ b/src/test/java/org/programmers/java/ValidaionTest.java @@ -1,16 +1,11 @@ package org.programmers.java; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.junit.jupiter.params.provider.ValueSource; -import org.programmers.java.console.Console; import org.programmers.java.validator.FormulaCountValidator; import org.programmers.java.validator.FormulaSplitValidator; -import org.programmers.java.validator.Validator; import java.util.Arrays; import java.util.List; @@ -18,9 +13,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; - public class ValidaionTest { - FormulaSplitValidator formulaSplitValidator = new FormulaSplitValidator(); FormulaCountValidator formulaCountValidator = new FormulaCountValidator(); @@ -43,7 +36,6 @@ static Stream makeFormulaAndList(){ ); } - @ParameterizedTest @DisplayName("연산식 검증: 연산자와 피연산자의 전체 개수 검증 및 위치 검증") @MethodSource("makeFormulaList") From 08dbbcb048c97fd76b3164e9d09e8889a7601dcc Mon Sep 17 00:00:00 2001 From: changhyeon Date: Thu, 15 Jun 2023 16:48:32 +0900 Subject: [PATCH 26/34] =?UTF-8?q?refactor:=20Repository=20formulaList=20?= =?UTF-8?q?=EB=B0=98=ED=99=98=20=EA=B0=92=20=EB=B0=A9=EC=96=B4=EC=A0=81=20?= =?UTF-8?q?=EB=B3=B5=EC=82=AC=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../programmers/java/repository/FormulaMemoryRepository.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/programmers/java/repository/FormulaMemoryRepository.java b/src/main/java/org/programmers/java/repository/FormulaMemoryRepository.java index 8fe6de12f..5370749bb 100644 --- a/src/main/java/org/programmers/java/repository/FormulaMemoryRepository.java +++ b/src/main/java/org/programmers/java/repository/FormulaMemoryRepository.java @@ -4,7 +4,7 @@ import java.util.Map; public class FormulaMemoryRepository implements FormulaRepository { - Map formulaMap = new LinkedHashMap<>(); + private final Map formulaMap = new LinkedHashMap<>(); private Long num = 0L; @Override @@ -18,6 +18,6 @@ public String save(String formula, String caculateValue) { @Override public Map getFormulaList() { - return formulaMap; + return new LinkedHashMap<>(formulaMap); } } From 55465386899b9aa1354a25a309a3b67fb2c7b69e Mon Sep 17 00:00:00 2001 From: changhyeon Date: Thu, 15 Jun 2023 16:58:54 +0900 Subject: [PATCH 27/34] =?UTF-8?q?refactor:=20Repository=20=EB=AC=B8?= =?UTF-8?q?=EC=9E=90=EC=97=B4=20=ED=8F=AC=EB=A9=A7=ED=8C=85=20=EC=B1=85?= =?UTF-8?q?=EC=9E=84=20=EC=BB=A8=ED=8A=B8=EB=A1=A4=EB=9F=AC=EB=A1=9C=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99,=20save=20=EB=B0=98=ED=99=98=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/programmers/java/Calculator.java | 19 +++++++++---------- .../repository/FormulaMemoryRepository.java | 8 ++------ .../java/repository/FormulaRepository.java | 2 +- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/programmers/java/Calculator.java b/src/main/java/org/programmers/java/Calculator.java index d174e1d98..b8f8b77ea 100644 --- a/src/main/java/org/programmers/java/Calculator.java +++ b/src/main/java/org/programmers/java/Calculator.java @@ -59,20 +59,19 @@ private void formulaCalculate() { if(validator.formulaValidate(inputFormula)){ String result = calculation.requestCalculate(inputFormula); output.calculationValue(result); - String getFormula = formulaRepository.save(inputFormula, result); - compareFormula(getFormula, inputFormula, result); + String formulaAndResult = formattingFormula(inputFormula, result); + formulaRepository.save(formulaAndResult); } } - private void compareFormula(String getFormula, String inputFormula, String result){ + private String formattingFormula(String inputFormula, String result){ StringBuilder stringBuilder = new StringBuilder(); - stringBuilder + return stringBuilder .append(inputFormula) - .append(" = ") - .append(result); - String formula = stringBuilder.toString(); - if(!getFormula.equals(formula)){ - output.errorMsg(Error.DOES_NOT_MATCH_DATA.getMsg()); - } + .append("=") + .append(result) + .toString(); } + + } diff --git a/src/main/java/org/programmers/java/repository/FormulaMemoryRepository.java b/src/main/java/org/programmers/java/repository/FormulaMemoryRepository.java index 5370749bb..9a6c477bc 100644 --- a/src/main/java/org/programmers/java/repository/FormulaMemoryRepository.java +++ b/src/main/java/org/programmers/java/repository/FormulaMemoryRepository.java @@ -8,12 +8,8 @@ public class FormulaMemoryRepository implements FormulaRepository { private Long num = 0L; @Override - public String save(String formula, String caculateValue) { - StringBuilder stringBuilder = new StringBuilder(formula); - stringBuilder.append(" = "); - stringBuilder.append(caculateValue); - formulaMap.put(num++, stringBuilder.toString()); - return formulaMap.get(num-1); + public void save(String formulaAndResult) { + formulaMap.put(num++, formulaAndResult); } @Override diff --git a/src/main/java/org/programmers/java/repository/FormulaRepository.java b/src/main/java/org/programmers/java/repository/FormulaRepository.java index 128fd7422..dfe0b0109 100644 --- a/src/main/java/org/programmers/java/repository/FormulaRepository.java +++ b/src/main/java/org/programmers/java/repository/FormulaRepository.java @@ -3,6 +3,6 @@ import java.util.Map; public interface FormulaRepository { - String save(String formula, String caculateValue); + void save(String formulaAndResult); Map getFormulaList(); } From 60e1335876796018ea48c9e9697559cb1d4c4911 Mon Sep 17 00:00:00 2001 From: changhyeon Date: Thu, 15 Jun 2023 17:12:42 +0900 Subject: [PATCH 28/34] =?UTF-8?q?refactor:=20=EB=A9=94=EC=84=9C=EB=93=9C?= =?UTF-8?q?=EB=A5=BC=20=ED=86=B5=ED=95=9C=20=EA=B0=80=EB=8F=85=EC=84=B1=20?= =?UTF-8?q?=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/programmers/java/validator/Validator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/programmers/java/validator/Validator.java b/src/main/java/org/programmers/java/validator/Validator.java index 996fc66c2..dab5ce1c7 100644 --- a/src/main/java/org/programmers/java/validator/Validator.java +++ b/src/main/java/org/programmers/java/validator/Validator.java @@ -23,7 +23,7 @@ public boolean formulaValidate(String formulaInput) { List formularAfterSplitValidate = formulaSplitValidator.validate(formulaInput); - if(formularAfterSplitValidate.size() != 0) { + if(formularAfterSplitValidate.isEmpty()) { isNormalFormula = formulaCountValidator.validate(formularAfterSplitValidate); } From c0d283bb60d316ff1db171549c1549b1383288c3 Mon Sep 17 00:00:00 2001 From: changhyeon Date: Thu, 15 Jun 2023 18:00:17 +0900 Subject: [PATCH 29/34] =?UTF-8?q?refactor:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=20=EC=97=B0=EC=82=B0=EA=B3=BC=20=EC=A4=91=EB=B3=B5=EB=90=9C=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=EB=A5=BC=20=EC=A4=84=EC=9D=B4=EA=B3=A0=20?= =?UTF-8?q?=ED=95=98=EB=82=98=EC=9D=98=20=EA=B0=9D=EC=B2=B4=EB=A1=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95,=20=EA=B2=80=EC=A6=9D=20=EC=98=88=EC=99=B8?= =?UTF-8?q?=20=EC=B2=98=EB=A6=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/validator/FormulaCountValidator.java | 38 -------------- .../java/validator/FormulaSplitValidator.java | 52 ------------------- 2 files changed, 90 deletions(-) delete mode 100644 src/main/java/org/programmers/java/validator/FormulaCountValidator.java delete mode 100644 src/main/java/org/programmers/java/validator/FormulaSplitValidator.java diff --git a/src/main/java/org/programmers/java/validator/FormulaCountValidator.java b/src/main/java/org/programmers/java/validator/FormulaCountValidator.java deleted file mode 100644 index fc0c242f3..000000000 --- a/src/main/java/org/programmers/java/validator/FormulaCountValidator.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.programmers.java.validator; - -import org.programmers.java.calculation.Operator; - -import java.util.List; - -public class FormulaCountValidator { - // 연산식 검증: 연산자와 피연산자의 전체 개수 검증 및 위치 검증 - public boolean validate(List formularAfterSplitValidate){ - boolean isNormalFormula = false; - - if(formularAfterSplitValidate.size() % 2 == 0) { - return isNormalFormula; - } - - for(int i=0; i < formularAfterSplitValidate.size(); i++){ - String operatorOrOperand = formularAfterSplitValidate.get(i); - - if (checkOperatorAndOperandLocation(i, operatorOrOperand)) { - return isNormalFormula; - } - } - - return true; - } - - private boolean checkOperatorAndOperandLocation(int index, String operatorOrOperand) { - if(index % 2 == 0 && !Operator.isNumber(operatorOrOperand)) { - return true; - } - - if(index % 2 == 1 && !Operator.isSymbol(operatorOrOperand).isPresent()) { - return true; - } - - return false; - } -} diff --git a/src/main/java/org/programmers/java/validator/FormulaSplitValidator.java b/src/main/java/org/programmers/java/validator/FormulaSplitValidator.java deleted file mode 100644 index 5f44d067f..000000000 --- a/src/main/java/org/programmers/java/validator/FormulaSplitValidator.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.programmers.java.validator; - -import org.programmers.java.calculation.Operator; -import org.programmers.java.console.Console; -import org.programmers.java.console.Output; -import org.programmers.java.message.Error; - -import java.util.ArrayList; -import java.util.List; - -public class FormulaSplitValidator { - private final Output output; - private List formularAfterSplitValidate = new ArrayList<>(); - - public FormulaSplitValidator() { - this.output = Console.getInstance(); - } - - // 연산식 검증: 연산식 분해 후 하나씩 검증 - public List validate(String formulaInput){ - formularAfterSplitValidate.clear(); - String[] splitFormula = formulaInput.split(" "); - - for(String operatorOrOperand : splitFormula){ - if(!splitValidateAddInList(operatorOrOperand)){ - break; - } - } - - return formularAfterSplitValidate; - } - - private boolean splitValidateAddInList(String operatorOrOperand){ - if(Operator.isNumber(operatorOrOperand)) { - formularAfterSplitValidate.add(operatorOrOperand); - return true; - } - - if(Operator.isSymbol(operatorOrOperand).isPresent()) { - formularAfterSplitValidate.add(operatorOrOperand); - return true; - } - - if(!Operator.isNumber(operatorOrOperand) && !Operator.isSymbol(operatorOrOperand).isPresent()){ - output.errorMsg(Error.CALCULATE_VALIDATION.getMsg()); - formularAfterSplitValidate.clear(); - return false; - } - - return true; - } -} From cb0d3d0c690986cf78ca89fd092fa47d5236ac78 Mon Sep 17 00:00:00 2001 From: changhyeon Date: Thu, 15 Jun 2023 18:07:26 +0900 Subject: [PATCH 30/34] =?UTF-8?q?refactor:=20Calculator=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=EC=9E=90=EC=9D=98=20=EC=A0=91=EA=B7=BC=20=EC=A0=9C?= =?UTF-8?q?=EC=96=B4=EC=9E=90=20default=EC=97=90=EC=84=9C=20public?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/programmers/java/Calculator.java | 18 +++--- .../programmers/java/validator/Validator.java | 56 ++++++++++++------- .../org/programmers/java/ValidaionTest.java | 2 - 3 files changed, 44 insertions(+), 32 deletions(-) diff --git a/src/main/java/org/programmers/java/Calculator.java b/src/main/java/org/programmers/java/Calculator.java index b8f8b77ea..058a2e916 100644 --- a/src/main/java/org/programmers/java/Calculator.java +++ b/src/main/java/org/programmers/java/Calculator.java @@ -15,14 +15,12 @@ public class Calculator { private final Output output; private final Calculation calculation; private final FormulaRepository formulaRepository; - private final Validator validator; - Calculator(Calculation calculation, FormulaRepository formulaRepository){ + public Calculator(Calculation calculation, FormulaRepository formulaRepository){ this.input = Console.getInstance(); this.output = Console.getInstance(); this.calculation = calculation; this.formulaRepository = formulaRepository; - this.validator = new Validator(); } void run() { @@ -55,13 +53,13 @@ private FunctionSelect getFunctionSelectNumber(String selectNum) { private void formulaCalculate() { String inputFormula = input.formulaInput(); + Validator.formulaValidate(inputFormula); - if(validator.formulaValidate(inputFormula)){ - String result = calculation.requestCalculate(inputFormula); - output.calculationValue(result); - String formulaAndResult = formattingFormula(inputFormula, result); - formulaRepository.save(formulaAndResult); - } + String result = calculation.requestCalculate(inputFormula); + output.calculationValue(result); + + String formulaAndResult = formattingFormula(inputFormula, result); + formulaRepository.save(formulaAndResult); } private String formattingFormula(String inputFormula, String result){ @@ -72,6 +70,4 @@ private String formattingFormula(String inputFormula, String result){ .append(result) .toString(); } - - } diff --git a/src/main/java/org/programmers/java/validator/Validator.java b/src/main/java/org/programmers/java/validator/Validator.java index dab5ce1c7..6223d48b6 100644 --- a/src/main/java/org/programmers/java/validator/Validator.java +++ b/src/main/java/org/programmers/java/validator/Validator.java @@ -1,36 +1,54 @@ package org.programmers.java.validator; -import org.programmers.java.console.Console; -import org.programmers.java.console.Output; +import org.programmers.java.calculation.Operator; import org.programmers.java.message.Error; +import java.util.ArrayList; import java.util.List; public class Validator { - private final Output output; - private final FormulaCountValidator formulaCountValidator; - private final FormulaSplitValidator formulaSplitValidator; - - public Validator() { - this.output = Console.getInstance(); - this.formulaCountValidator = new FormulaCountValidator(); - this.formulaSplitValidator = new FormulaSplitValidator(); + private static final List formularAfterSplitValidate = new ArrayList<>(); + + public static void formulaValidate(String formulaInput) { + formularAfterSplitValidate.clear(); + formulaSplitValidate(formulaInput); + formulaCountValidate(formularAfterSplitValidate); } - // 연산식 검증 로직 - public boolean formulaValidate(String formulaInput) { - boolean isNormalFormula = false; + private static void formulaSplitValidate(String formulaInput) { + String[] splitFormula = formulaInput.split(" "); - List formularAfterSplitValidate = formulaSplitValidator.validate(formulaInput); + for (String operatorOrOperand : splitFormula) { + if (!isValid(operatorOrOperand)) { + throw new IllegalArgumentException(Error.CALCULATE_VALIDATION.getMsg()); + } + formularAfterSplitValidate.add(operatorOrOperand); + } + } + + private static boolean isValid(String operatorOrOperand) { + return Operator.isNumber(operatorOrOperand) || + Operator.isSymbol(operatorOrOperand).isPresent(); + } - if(formularAfterSplitValidate.isEmpty()) { - isNormalFormula = formulaCountValidator.validate(formularAfterSplitValidate); + private static void formulaCountValidate(List formularAfterSplitValidate){ + if(formularAfterSplitValidate.size() % 2 == 0) { + throw new IllegalArgumentException(Error.CALCULATE_VALIDATION.getMsg()); } - if(!isNormalFormula) { - output.errorMsg(Error.CALCULATE_VALIDATION.getMsg()); + for(int i=0; i < formularAfterSplitValidate.size(); i++){ + String operatorOrOperand = formularAfterSplitValidate.get(i); + checkOperatorAndOperandLocation(i, operatorOrOperand); + } + } + + private static void checkOperatorAndOperandLocation(int index, String operatorOrOperand) { + if(index % 2 != 0 && Operator.isNumber(operatorOrOperand)) { + throw new IllegalArgumentException(Error.CALCULATE_VALIDATION.getMsg()); } - return isNormalFormula; + if(index % 2 != 1 && Operator.isSymbol(operatorOrOperand).isPresent()) { + throw new IllegalArgumentException(Error.CALCULATE_VALIDATION.getMsg()); + } } } diff --git a/src/test/java/org/programmers/java/ValidaionTest.java b/src/test/java/org/programmers/java/ValidaionTest.java index 06e74e78c..4ff389bb6 100644 --- a/src/test/java/org/programmers/java/ValidaionTest.java +++ b/src/test/java/org/programmers/java/ValidaionTest.java @@ -4,8 +4,6 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.programmers.java.validator.FormulaCountValidator; -import org.programmers.java.validator.FormulaSplitValidator; import java.util.Arrays; import java.util.List; From 09c72d732bfef3dadad0c0aadf18ba5912acd6c1 Mon Sep 17 00:00:00 2001 From: changhyeon Date: Thu, 15 Jun 2023 19:03:39 +0900 Subject: [PATCH 31/34] =?UTF-8?q?refactor:=20Map=EC=9D=84=20=EC=9D=B4?= =?UTF-8?q?=EC=9A=A9=ED=95=9C=20enum=20=EC=B5=9C=EC=A0=81=ED=99=94,=20?= =?UTF-8?q?=EC=97=B0=EC=82=B0=EC=9E=90=20=EC=B0=BE=EB=8A=94=20=EB=A9=94?= =?UTF-8?q?=EC=84=9C=EB=93=9C=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=ED=95=98=EC=97=AC=20=EA=B0=80=EB=8F=85=EC=84=B1=20?= =?UTF-8?q?=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../calculation/InfixToPostfixConverter.java | 2 +- .../java/calculation/Operator.java | 25 ++++++++++++++----- .../java/calculation/PostfixCalculation.java | 2 +- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/programmers/java/calculation/InfixToPostfixConverter.java b/src/main/java/org/programmers/java/calculation/InfixToPostfixConverter.java index 26a8aeda3..0eddfcb1d 100644 --- a/src/main/java/org/programmers/java/calculation/InfixToPostfixConverter.java +++ b/src/main/java/org/programmers/java/calculation/InfixToPostfixConverter.java @@ -29,7 +29,7 @@ private void operandAddInPostfix(String operatorOrOperand){ } private void checkOperatorToAddPostfix(String operatorOrOperand) { - if (Operator.isSymbol(operatorOrOperand).isPresent()) { + if (Operator.findSymbol(operatorOrOperand).isPresent()) { checkOperatorStackAndCompare(operatorOrOperand); } } diff --git a/src/main/java/org/programmers/java/calculation/Operator.java b/src/main/java/org/programmers/java/calculation/Operator.java index 7b760ccd2..1151c145f 100644 --- a/src/main/java/org/programmers/java/calculation/Operator.java +++ b/src/main/java/org/programmers/java/calculation/Operator.java @@ -1,9 +1,16 @@ package org.programmers.java.calculation; +import org.programmers.java.message.Error; + import java.util.Arrays; +import java.util.Collections; +import java.util.Map; import java.util.Optional; import java.util.function.BiFunction; +import java.util.function.Function; import java.util.regex.Pattern; +import java.util.stream.Collectors; +import java.util.stream.Stream; public enum Operator { PLUS("+", 2, (a, b) -> a + b), @@ -25,18 +32,24 @@ private int getPriority() { } public static boolean comparePriorities(String firstSymbol, String secondSymbol){ - return Operator.isSymbol(firstSymbol).get().getPriority() < Operator.isSymbol(secondSymbol).get().getPriority(); + return Operator.findSymbol(firstSymbol).get().getPriority() < Operator.findSymbol(secondSymbol).get().getPriority(); } public static int arithmeticExpression(String symbol, int firstOperand, int secondOperand){ - return isSymbol(symbol).get().expression.apply(firstOperand, secondOperand); + return findSymbol(symbol).get().expression.apply(firstOperand, secondOperand); + } + + public static Optional findSymbol(String inputSymbol){ + Map mapCollection = Collections.unmodifiableMap(Stream.of(values()). + collect(Collectors.toMap(Operator::getSymbol, Function.identity()))); + + return Optional.ofNullable(mapCollection.get(inputSymbol)); + // Arrays.stream(values()).filter(operator -> operator.symbol.equals(inputSymbol)).findAny(); } - public static Optional isSymbol(String inputSymbol){ - return Arrays.stream(values()) - .filter(operator -> operator.symbol.equals(inputSymbol)) - .findAny(); + private String getSymbol() { + return symbol; } public static boolean isNumber(String inputNumber){ diff --git a/src/main/java/org/programmers/java/calculation/PostfixCalculation.java b/src/main/java/org/programmers/java/calculation/PostfixCalculation.java index 634e60c4c..7129135f9 100644 --- a/src/main/java/org/programmers/java/calculation/PostfixCalculation.java +++ b/src/main/java/org/programmers/java/calculation/PostfixCalculation.java @@ -23,7 +23,7 @@ private void numberAddInStack(String operatorOrOperand){ } private void calculationResultAddInStack(String operatorOrOperand) { - if(Operator.isSymbol(operatorOrOperand).isPresent()){ + if(Operator.findSymbol(operatorOrOperand).isPresent()){ int num2 = Integer.parseInt(numberDeque.removeLast()); int num1 = Integer.parseInt(numberDeque.removeLast()); From ed2afb1ac5fc11b1642c292d4ce58aba73331674 Mon Sep 17 00:00:00 2001 From: changhyeon Date: Thu, 15 Jun 2023 19:17:53 +0900 Subject: [PATCH 32/34] =?UTF-8?q?refactor:=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EC=BD=94=EB=93=9C=EB=A5=BC=20=EC=9C=84=ED=95=9C=20private?= =?UTF-8?q?=EC=97=90=EC=84=9C=20public=EC=9C=BC=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD,=20Repository=20=ED=85=8C=EC=8A=A4=ED=8A=B8=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../programmers/java/validator/Validator.java | 8 ++++---- .../org/programmers/java/RepositoryTest.java | 19 ++++++++++++++++--- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/programmers/java/validator/Validator.java b/src/main/java/org/programmers/java/validator/Validator.java index 6223d48b6..ba3f7a56f 100644 --- a/src/main/java/org/programmers/java/validator/Validator.java +++ b/src/main/java/org/programmers/java/validator/Validator.java @@ -15,7 +15,7 @@ public static void formulaValidate(String formulaInput) { formulaCountValidate(formularAfterSplitValidate); } - private static void formulaSplitValidate(String formulaInput) { + public static void formulaSplitValidate(String formulaInput) { String[] splitFormula = formulaInput.split(" "); for (String operatorOrOperand : splitFormula) { @@ -28,10 +28,10 @@ private static void formulaSplitValidate(String formulaInput) { private static boolean isValid(String operatorOrOperand) { return Operator.isNumber(operatorOrOperand) || - Operator.isSymbol(operatorOrOperand).isPresent(); + Operator.findSymbol(operatorOrOperand).isPresent(); } - private static void formulaCountValidate(List formularAfterSplitValidate){ + public static void formulaCountValidate(List formularAfterSplitValidate){ if(formularAfterSplitValidate.size() % 2 == 0) { throw new IllegalArgumentException(Error.CALCULATE_VALIDATION.getMsg()); } @@ -47,7 +47,7 @@ private static void checkOperatorAndOperandLocation(int index, String operatorOr throw new IllegalArgumentException(Error.CALCULATE_VALIDATION.getMsg()); } - if(index % 2 != 1 && Operator.isSymbol(operatorOrOperand).isPresent()) { + if(index % 2 != 1 && Operator.findSymbol(operatorOrOperand).isPresent()) { throw new IllegalArgumentException(Error.CALCULATE_VALIDATION.getMsg()); } } diff --git a/src/test/java/org/programmers/java/RepositoryTest.java b/src/test/java/org/programmers/java/RepositoryTest.java index 25b5f0c54..89611c274 100644 --- a/src/test/java/org/programmers/java/RepositoryTest.java +++ b/src/test/java/org/programmers/java/RepositoryTest.java @@ -20,7 +20,8 @@ public class RepositoryTest { @CsvSource(value={"3 + 6 / 2 : 6", "10 / 2 * 5 - 3 : 22"}, delimiter = ':') void save(String formula, String result){ // when - formulaRepository.save(formula, result); + String formulaAndResult = formattingFormula(formula, result); + formulaRepository.save(formulaAndResult); // then assertEquals(formula + " = " + result, formulaRepository.getFormulaList().get(0L)); @@ -40,11 +41,23 @@ void getFormulaList(){ 1L, "10 / 2 * 5 - 3 = 22" ); + String formulaAndResult1 = formattingFormula(formula1, result2); + String formulaAndResult2 = formattingFormula(formula2, result2); + // when - formulaRepository.save(formula1, result1); - formulaRepository.save(formula2, result2); + formulaRepository.save(formulaAndResult1); + formulaRepository.save(formulaAndResult2); // then Assertions.assertEquals(formulaListExpect, formulaRepository.getFormulaList()); } + + private String formattingFormula(String inputFormula, String result){ + StringBuilder stringBuilder = new StringBuilder(); + return stringBuilder + .append(inputFormula) + .append("=") + .append(result) + .toString(); + } } From 1259231b892badd8e302b1693bdb4c7d273b9c2e Mon Sep 17 00:00:00 2001 From: changhyeon Date: Thu, 15 Jun 2023 19:21:16 +0900 Subject: [PATCH 33/34] =?UTF-8?q?refactor:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EA=B0=9C=ED=96=89,=20=EB=A9=94=EC=84=9C=EB=93=9C?= =?UTF-8?q?=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/programmers/java/calculation/Operator.java | 1 - src/main/java/org/programmers/java/console/Console.java | 5 ----- src/main/java/org/programmers/java/console/Output.java | 1 - src/test/java/org/programmers/java/RepositoryTest.java | 2 +- 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/main/java/org/programmers/java/calculation/Operator.java b/src/main/java/org/programmers/java/calculation/Operator.java index 1151c145f..c014d0c64 100644 --- a/src/main/java/org/programmers/java/calculation/Operator.java +++ b/src/main/java/org/programmers/java/calculation/Operator.java @@ -33,7 +33,6 @@ private int getPriority() { public static boolean comparePriorities(String firstSymbol, String secondSymbol){ return Operator.findSymbol(firstSymbol).get().getPriority() < Operator.findSymbol(secondSymbol).get().getPriority(); - } public static int arithmeticExpression(String symbol, int firstOperand, int secondOperand){ diff --git a/src/main/java/org/programmers/java/console/Console.java b/src/main/java/org/programmers/java/console/Console.java index 1a7165ff2..37b18f000 100644 --- a/src/main/java/org/programmers/java/console/Console.java +++ b/src/main/java/org/programmers/java/console/Console.java @@ -48,11 +48,6 @@ public void selectMsg(String selectNum) { System.out.println(Info.SELECT_NUM.getMsg() + selectNum); } - @Override - public void formulaMsg(String inputMsg) { - System.out.println(inputMsg); - } - @Override public void calculationValue(String value) { System.out.println(value); diff --git a/src/main/java/org/programmers/java/console/Output.java b/src/main/java/org/programmers/java/console/Output.java index 9c3c990a5..9eefee698 100644 --- a/src/main/java/org/programmers/java/console/Output.java +++ b/src/main/java/org/programmers/java/console/Output.java @@ -6,7 +6,6 @@ public interface Output { void menuMsg(); void errorMsg(String msg); void selectMsg(String selectNum); - void formulaMsg(String inputMsg); void calculationValue(String value); void getCalculationValues(Map Values); void exitMsg(); diff --git a/src/test/java/org/programmers/java/RepositoryTest.java b/src/test/java/org/programmers/java/RepositoryTest.java index 89611c274..b37f70e50 100644 --- a/src/test/java/org/programmers/java/RepositoryTest.java +++ b/src/test/java/org/programmers/java/RepositoryTest.java @@ -41,7 +41,7 @@ void getFormulaList(){ 1L, "10 / 2 * 5 - 3 = 22" ); - String formulaAndResult1 = formattingFormula(formula1, result2); + String formulaAndResult1 = formattingFormula(formula1, result1); String formulaAndResult2 = formattingFormula(formula2, result2); // when From 9dec394db0ed2c7b0a4987fd61a3162e6bd19c86 Mon Sep 17 00:00:00 2001 From: changhyeon Date: Thu, 15 Jun 2023 20:08:19 +0900 Subject: [PATCH 34/34] =?UTF-8?q?refactor:=20=EC=98=88=EC=99=B8=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/programmers/java/OperatorTest.java | 1 - .../org/programmers/java/RepositoryTest.java | 2 +- .../org/programmers/java/ValidaionTest.java | 40 ++++++------------- 3 files changed, 13 insertions(+), 30 deletions(-) diff --git a/src/test/java/org/programmers/java/OperatorTest.java b/src/test/java/org/programmers/java/OperatorTest.java index 24065d046..b90b6ea63 100644 --- a/src/test/java/org/programmers/java/OperatorTest.java +++ b/src/test/java/org/programmers/java/OperatorTest.java @@ -1,6 +1,5 @@ package org.programmers.java; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.programmers.java.calculation.Operator; diff --git a/src/test/java/org/programmers/java/RepositoryTest.java b/src/test/java/org/programmers/java/RepositoryTest.java index b37f70e50..af171c9ca 100644 --- a/src/test/java/org/programmers/java/RepositoryTest.java +++ b/src/test/java/org/programmers/java/RepositoryTest.java @@ -56,7 +56,7 @@ private String formattingFormula(String inputFormula, String result){ StringBuilder stringBuilder = new StringBuilder(); return stringBuilder .append(inputFormula) - .append("=") + .append(" = ") .append(result) .toString(); } diff --git a/src/test/java/org/programmers/java/ValidaionTest.java b/src/test/java/org/programmers/java/ValidaionTest.java index 4ff389bb6..b4b462d87 100644 --- a/src/test/java/org/programmers/java/ValidaionTest.java +++ b/src/test/java/org/programmers/java/ValidaionTest.java @@ -4,52 +4,36 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.junit.jupiter.params.provider.ValueSource; +import org.programmers.java.validator.Validator; import java.util.Arrays; import java.util.List; import java.util.stream.Stream; -import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; public class ValidaionTest { - FormulaSplitValidator formulaSplitValidator = new FormulaSplitValidator(); - FormulaCountValidator formulaCountValidator = new FormulaCountValidator(); @ParameterizedTest - @DisplayName("연산식 검증: 연산식 분해 검증") - @MethodSource("makeFormulaAndList") - void formulaSplitValidation(String input, List formula){ - // when - List formulaList = formulaSplitValidator.validate(input); - - // then - assertEquals(formula, formulaList); - } - - static Stream makeFormulaAndList(){ - return Stream.of( - Arguments.of("10 + 4 / 20 * 3 - 2", Arrays.asList("10", "+", "4", "/", "20", "*", "3", "-", "2")), - Arguments.of("5 - 2 * 20 + 3 / 2", Arrays.asList("5","-","2","*","20","+","3","/","2")), - Arguments.of("7 * 2 - 3 / 3 + 2", Arrays.asList("7","*","2","-","3","/","3","+","2")) - ); + @DisplayName("연산자 혹은 피연산자가 아닌 것이 들어오면 예외가 발생한다.") + @ValueSource(strings = {"10 + 4 / 20 * 3 - ㄱ", "# + 3 - 11", "****"}) + void formulaSplitValidation(String input){ + assertThrows(IllegalArgumentException.class, () -> Validator.formulaSplitValidate(input)); } @ParameterizedTest - @DisplayName("연산식 검증: 연산자와 피연산자의 전체 개수 검증 및 위치 검증") + @DisplayName("연산자와 피연산자 수, 리스트 전체 개수, 위치가 맞지 않으면 예외가 발상핸다.") @MethodSource("makeFormulaList") void checkFormulaValidation(List formulaList){ - // when - Boolean checkedFormulaValidation = formulaCountValidator.validate(formulaList); - - // then - assertEquals(checkedFormulaValidation, true); + assertThrows(IllegalArgumentException.class, () -> Validator.formulaCountValidate(formulaList)); } static Stream makeFormulaList(){ return Stream.of( - Arguments.of(Arrays.asList("10", "+", "4", "/", "20", "*", "3", "-", "2")), - Arguments.of(Arrays.asList("5","-","2","*","20","+","3","/","2")), - Arguments.of(Arrays.asList("7","*","2","-","3","/","3","+","2")) + Arguments.of(Arrays.asList("10", "+", "4", "/", "20", "*", "3", "-")), + Arguments.of(Arrays.asList("5","2","*","20","+","3","/","2")), + Arguments.of(Arrays.asList("7","*","2","-","3","/","3","+")) ); } }