From 9686378f373c99d00dd1b8d2576ced0d4c5f2fc8 Mon Sep 17 00:00:00 2001 From: ddongpuri Date: Sun, 11 Jun 2023 18:56:49 +0900 Subject: [PATCH 1/5] =?UTF-8?q?feat=20:=20=EA=B8=B0=EB=8A=A5=20=EC=84=A0?= =?UTF-8?q?=ED=83=9D=20=EB=B0=98=EB=B3=B5=EB=AC=B8=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Calculator/.gitignore | 55 ++++ Calculator/build.gradle | 19 ++ .../gradle/wrapper/gradle-wrapper.properties | 5 + Calculator/gradlew | 234 ++++++++++++++++++ Calculator/gradlew.bat | 89 +++++++ Calculator/settings.gradle | 2 + .../src/main/java/CalculateService.java | 18 ++ Calculator/src/main/java/Calculator.java | 53 ++++ .../src/main/java/CalculatorFunction.java | 7 + .../src/main/java/ResultSaveService.java | 22 ++ 10 files changed, 504 insertions(+) create mode 100644 Calculator/.gitignore create mode 100644 Calculator/build.gradle create mode 100644 Calculator/gradle/wrapper/gradle-wrapper.properties create mode 100755 Calculator/gradlew create mode 100644 Calculator/gradlew.bat create mode 100644 Calculator/settings.gradle create mode 100644 Calculator/src/main/java/CalculateService.java create mode 100644 Calculator/src/main/java/Calculator.java create mode 100644 Calculator/src/main/java/CalculatorFunction.java create mode 100644 Calculator/src/main/java/ResultSaveService.java diff --git a/Calculator/.gitignore b/Calculator/.gitignore new file mode 100644 index 000000000..d509c26f9 --- /dev/null +++ b/Calculator/.gitignore @@ -0,0 +1,55 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### Java ### +# Compiled class file +*.class + +.idea +.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 +*.iws + +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ +.idea/caches/build_file_checksums.ser +.idea/$CACHE_FILE$ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# Log file +*.log \ No newline at end of file diff --git a/Calculator/build.gradle b/Calculator/build.gradle new file mode 100644 index 000000000..4cf7992b8 --- /dev/null +++ b/Calculator/build.gradle @@ -0,0 +1,19 @@ +plugins { + id 'java' +} + +group 'com.devcourse' +version '1.0-SNAPSHOT' + +repositories { + mavenCentral() +} + +dependencies { + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2' +} + +test { + useJUnitPlatform() +} \ No newline at end of file diff --git a/Calculator/gradle/wrapper/gradle-wrapper.properties b/Calculator/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..41dfb8790 --- /dev/null +++ b/Calculator/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/Calculator/gradlew b/Calculator/gradlew new file mode 100755 index 000000000..1b6c78733 --- /dev/null +++ b/Calculator/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/Calculator/gradlew.bat b/Calculator/gradlew.bat new file mode 100644 index 000000000..ac1b06f93 --- /dev/null +++ b/Calculator/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/Calculator/settings.gradle b/Calculator/settings.gradle new file mode 100644 index 000000000..930f769a2 --- /dev/null +++ b/Calculator/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'Calculator' + diff --git a/Calculator/src/main/java/CalculateService.java b/Calculator/src/main/java/CalculateService.java new file mode 100644 index 000000000..22ead5cea --- /dev/null +++ b/Calculator/src/main/java/CalculateService.java @@ -0,0 +1,18 @@ +public class CalculateService implements CalculatorFunction { + + String name; + + public CalculateService(String name) { + this.name = name; + } + + @Override + public void doService() { + System.out.println("CalculateService.doService"); + } + + @Override + public String getName() { + return this.name; + } +} diff --git a/Calculator/src/main/java/Calculator.java b/Calculator/src/main/java/Calculator.java new file mode 100644 index 000000000..59358a093 --- /dev/null +++ b/Calculator/src/main/java/Calculator.java @@ -0,0 +1,53 @@ +import java.util.HashMap; +import java.util.Map; +import java.util.Scanner; + +public class Calculator { + + private Integer optionNumber = 2; + private ResultSaveService resultSaveService; + private CalculateService calculateService; + private static Map menus = new HashMap<>(); + private StringBuilder menusBuilder = new StringBuilder(); + + public Calculator(ResultSaveService resultSaveService, CalculateService calculateService) { + this.resultSaveService = resultSaveService; + this.calculateService = calculateService; + } + + public static void main(String[] args) { + + ResultSaveService saveService = new ResultSaveService("조회"); + CalculateService calService = new CalculateService("계산"); + Calculator calculator = new Calculator(saveService, calService); + + calculator.menus.put(1, saveService); + calculator.menus.put(2, calService); + + + for (int i = 1; i <= calculator.menus.size(); i++) { + calculator.menusBuilder.append(i + ". " + menus.get(i).getName() + "\n"); + } + + calculator.menusBuilder.append("\n"); + calculator.menusBuilder.append("선택 : "); + + calculator.run(); + } + + private void run() { + + while (true) { + System.out.print(menusBuilder); + + Scanner scanner = new Scanner(System.in); + + int optionNumber = scanner.nextInt(); + + CalculatorFunction calculatorFunction = menus.get(optionNumber); + + calculatorFunction.doService(); + } + + } +} diff --git a/Calculator/src/main/java/CalculatorFunction.java b/Calculator/src/main/java/CalculatorFunction.java new file mode 100644 index 000000000..a42238229 --- /dev/null +++ b/Calculator/src/main/java/CalculatorFunction.java @@ -0,0 +1,7 @@ +public interface CalculatorFunction { + + String name = null; + + public void doService(); + public String getName(); +} diff --git a/Calculator/src/main/java/ResultSaveService.java b/Calculator/src/main/java/ResultSaveService.java new file mode 100644 index 000000000..aa4d73ea2 --- /dev/null +++ b/Calculator/src/main/java/ResultSaveService.java @@ -0,0 +1,22 @@ +import java.util.HashMap; +import java.util.Map; + +public class ResultSaveService implements CalculatorFunction { + + String name; + Map results = new HashMap<>(); + + public ResultSaveService(String name) { + this.name = name; + } + + @Override + public void doService() { + System.out.println("ResultSaveService.doService"); + } + + @Override + public String getName() { + return this.name; + } +} From df3b5a8ca1a1bfea7bcb338ceb2cbb0b0869ee6a Mon Sep 17 00:00:00 2001 From: ddongpuri Date: Sun, 11 Jun 2023 19:20:32 +0900 Subject: [PATCH 2/5] =?UTF-8?q?feat=20:=20=EA=B3=84=EC=82=B0=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=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/CalculateService.java | 148 +++++++++++++++++- Calculator/src/main/java/Calculator.java | 3 +- .../src/main/java/ResultSaveService.java | 5 + 3 files changed, 152 insertions(+), 4 deletions(-) diff --git a/Calculator/src/main/java/CalculateService.java b/Calculator/src/main/java/CalculateService.java index 22ead5cea..7dc4ce129 100644 --- a/Calculator/src/main/java/CalculateService.java +++ b/Calculator/src/main/java/CalculateService.java @@ -1,6 +1,14 @@ +import java.util.Deque; +import java.util.LinkedList; +import java.util.Scanner; + public class CalculateService implements CalculatorFunction { - String name; + private String name; + private LinkedList expForCal = new LinkedList<>(); + private String result; + static StringBuilder num = new StringBuilder(); + static Deque queue = new LinkedList<>(); public CalculateService(String name) { this.name = name; @@ -8,7 +16,143 @@ public CalculateService(String name) { @Override public void doService() { - System.out.println("CalculateService.doService"); + + String expression; + LinkedList expForCal; + String result; + + while (true) { + try { + expression = readExpression(); + expForCal = fullTextParsing(expression); + result = calculate(expForCal); + break; + + } catch (Exception e) { + System.out.println("다시 입력해주세요."); + } + } + + System.out.println(result); + } + + private static String calculate(LinkedList expForCal) throws Exception { + return plusOrMinus(divideOrMultiple(expForCal)); + } + + private static String plusOrMinus(LinkedList expression) { + + Double sum = Double.valueOf(0); + + while (!expression.isEmpty()) { + String current = expression.pollFirst(); + + if (current.equals("-")) { + sum -= Double.valueOf(expression.pollFirst()); + } else if (current.equals("+")) { + sum += Double.valueOf(expression.pollFirst()); + } else { + sum += Double.valueOf(current); + } + } + + String result = String.valueOf(sum); + int deciPoint = result.indexOf("."); + + // 정수 -> 소수점 제거 + if (deciPoint == result.length() - 2 && result.charAt(deciPoint + 1) == '0') { + return String.valueOf((Math.round(sum))); + } + + return String.valueOf(sum); + } + + private static LinkedList divideOrMultiple(LinkedList expForCal) throws Exception { + + Double v; + + while (!expForCal.isEmpty()) { + String peek = expForCal.peek(); + + if (peek.equals("*")) { + expForCal.pollFirst(); + v = Double.parseDouble(queue.pollLast()) * Double.parseDouble(expForCal.poll()); + queue.add(String.valueOf(v)); + + } else if (peek.equals("/")) { + expForCal.pollFirst(); + v = Double.parseDouble(queue.pollLast()) / Double.parseDouble(expForCal.poll()); + + if (v.isInfinite()) { + System.out.print("0으로 나눌 수 없습니다. "); + throw new Exception(); + } + + queue.add(String.valueOf(v)); + } else { + String poll = expForCal.pollFirst(); + queue.add(poll); + } + + } + + queue.stream().forEach(o -> expForCal.add(o)); + queue.clear(); + return expForCal; + } + + private static String readExpression() { + Scanner scanner = new Scanner(System.in); + + String input = scanner.nextLine(); + String inputRefined = input.replaceAll("\\s", ""); + return inputRefined; + } + + public static LinkedList fullTextParsing(String inputRefined) throws Exception { + + LinkedList equationElements = new LinkedList<>(); + + if (!isValidFormula(inputRefined)) { + System.out.printf("계산식이 올바르지 않습니다. "); + throw new Exception("BAD_INPUT"); + } + + for (int i = 0; i < inputRefined.length(); i++) { + char c = inputRefined.charAt(i); + + if (Character.isDigit(c)) { + num.append(c); + } else { + if (!num.isEmpty()) equationElements.add(num.toString()); + num.setLength(0); + equationElements.add(c + ""); + } + } + + equationElements.add(num.toString()); + num.setLength(0); + + return equationElements; + } + + public static boolean isValidFormula(String inputRefined) { + + boolean startWithNum = true; + boolean onlyAllowed = true; + + char firstChar = inputRefined.charAt(0); + + if (firstChar == '+' || firstChar == '*' || firstChar == '/') { + System.out.println("유효하지 않은 수식입니다!"); + startWithNum = false; + } + + if (!inputRefined.matches("^([0-9/./+/*///-]*)[0-9]$")) { + onlyAllowed = false; + } + + return startWithNum && onlyAllowed; } @Override diff --git a/Calculator/src/main/java/Calculator.java b/Calculator/src/main/java/Calculator.java index 59358a093..f06407824 100644 --- a/Calculator/src/main/java/Calculator.java +++ b/Calculator/src/main/java/Calculator.java @@ -41,12 +41,11 @@ private void run() { System.out.print(menusBuilder); Scanner scanner = new Scanner(System.in); - int optionNumber = scanner.nextInt(); CalculatorFunction calculatorFunction = menus.get(optionNumber); - calculatorFunction.doService(); + } } diff --git a/Calculator/src/main/java/ResultSaveService.java b/Calculator/src/main/java/ResultSaveService.java index aa4d73ea2..cd4104fe0 100644 --- a/Calculator/src/main/java/ResultSaveService.java +++ b/Calculator/src/main/java/ResultSaveService.java @@ -13,6 +13,11 @@ public ResultSaveService(String name) { @Override public void doService() { System.out.println("ResultSaveService.doService"); + + if (results.size() == 0) { + System.out.println("[ 조회된 계산이력 없음 ]\n"); + + } } @Override From f039845c787c09249e8ec67ee87314f005fe0c2f Mon Sep 17 00:00:00 2001 From: ddongpuri Date: Sun, 11 Jun 2023 21:44:17 +0900 Subject: [PATCH 3/5] =?UTF-8?q?feat=20:=20=EA=B3=84=EC=82=B0=EA=B2=B0?= =?UTF-8?q?=EA=B3=BC=20=EC=A0=80=EC=9E=A5=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/CalculateService.java | 9 +++-- Calculator/src/main/java/Calculator.java | 7 ++-- .../src/main/java/CalculatorFunction.java | 2 +- Calculator/src/main/java/Result.java | 34 +++++++++++++++++++ .../src/main/java/ResultSaveService.java | 19 ++++++++--- 5 files changed, 61 insertions(+), 10 deletions(-) create mode 100644 Calculator/src/main/java/Result.java diff --git a/Calculator/src/main/java/CalculateService.java b/Calculator/src/main/java/CalculateService.java index 7dc4ce129..5c6ca1ab2 100644 --- a/Calculator/src/main/java/CalculateService.java +++ b/Calculator/src/main/java/CalculateService.java @@ -15,7 +15,7 @@ public CalculateService(String name) { } @Override - public void doService() { + public void doService(Calculator calculator) { String expression; LinkedList expForCal; @@ -34,6 +34,9 @@ public void doService() { } System.out.println(result); + + calculator.getResultSaveService().save(new Result(expression, result)); + } private static String calculate(LinkedList expForCal) throws Exception { @@ -84,8 +87,8 @@ private static LinkedList divideOrMultiple(LinkedList expForCal) v = Double.parseDouble(queue.pollLast()) / Double.parseDouble(expForCal.poll()); if (v.isInfinite()) { - System.out.print("0으로 나눌 수 없습니다. "); - throw new Exception(); + System.out.print("0 으로 나눌 수 없습니다. "); + throw new ArithmeticException(); } queue.add(String.valueOf(v)); diff --git a/Calculator/src/main/java/Calculator.java b/Calculator/src/main/java/Calculator.java index f06407824..47c2243a6 100644 --- a/Calculator/src/main/java/Calculator.java +++ b/Calculator/src/main/java/Calculator.java @@ -44,9 +44,12 @@ private void run() { int optionNumber = scanner.nextInt(); CalculatorFunction calculatorFunction = menus.get(optionNumber); - calculatorFunction.doService(); - + calculatorFunction.doService(this); } } + + public ResultSaveService getResultSaveService() { + return resultSaveService; + } } diff --git a/Calculator/src/main/java/CalculatorFunction.java b/Calculator/src/main/java/CalculatorFunction.java index a42238229..463512a32 100644 --- a/Calculator/src/main/java/CalculatorFunction.java +++ b/Calculator/src/main/java/CalculatorFunction.java @@ -2,6 +2,6 @@ public interface CalculatorFunction { String name = null; - public void doService(); + public void doService(Calculator calculator); public String getName(); } diff --git a/Calculator/src/main/java/Result.java b/Calculator/src/main/java/Result.java new file mode 100644 index 000000000..e06b7e5d8 --- /dev/null +++ b/Calculator/src/main/java/Result.java @@ -0,0 +1,34 @@ +public class Result { + + private String expression; + private String answer; + + public Result(String expression, String answer) { + this.expression = formalize(expression); + this.answer = answer; + } + + private String formalize(String expression) { + StringBuilder sb = new StringBuilder(); + char c; + + for (int i = 0; i < expression.length(); i++) { + c = expression.charAt(i); + + if (!Character.isDigit(c)) sb.append(' ').append(c).append(' '); + else sb.append(c); + } + + if (sb.length() > 1 && sb.charAt(1) == '-') { + sb.deleteCharAt(2); + sb.deleteCharAt(0); + } + + return sb.toString(); + } + + public String fullEquation() { + return expression + " = " + answer + "\n"; + } + +} diff --git a/Calculator/src/main/java/ResultSaveService.java b/Calculator/src/main/java/ResultSaveService.java index cd4104fe0..3859a47c9 100644 --- a/Calculator/src/main/java/ResultSaveService.java +++ b/Calculator/src/main/java/ResultSaveService.java @@ -1,22 +1,29 @@ -import java.util.HashMap; -import java.util.Map; +import java.util.*; public class ResultSaveService implements CalculatorFunction { String name; - Map results = new HashMap<>(); + LinkedHashMap results = new LinkedHashMap<>(); public ResultSaveService(String name) { this.name = name; } @Override - public void doService() { + public void doService(Calculator calculator) { System.out.println("ResultSaveService.doService"); if (results.size() == 0) { System.out.println("[ 조회된 계산이력 없음 ]\n"); + } else { + StringBuilder savedResults = new StringBuilder(); + Iterator iterator = results.keySet().iterator(); + while(iterator.hasNext()) { + Result result = results.get(iterator.next()); + savedResults.append(result.fullEquation()); + } + System.out.println(savedResults); } } @@ -24,4 +31,8 @@ public void doService() { public String getName() { return this.name; } + + public void save(Result result) { + results.put(results.size() + 1, result); + } } From fca260529c738c38b20bcb18777821ee6482ce88 Mon Sep 17 00:00:00 2001 From: ddongpuri Date: Sun, 11 Jun 2023 22:16:07 +0900 Subject: [PATCH 4/5] =?UTF-8?q?fix=20:=20=EC=98=88=EC=99=B8=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Calculator/src/main/java/CalculateService.java | 2 +- Calculator/src/main/java/Calculator.java | 13 ++++++++----- Calculator/src/main/java/ResultSaveService.java | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Calculator/src/main/java/CalculateService.java b/Calculator/src/main/java/CalculateService.java index 5c6ca1ab2..6da30e9a6 100644 --- a/Calculator/src/main/java/CalculateService.java +++ b/Calculator/src/main/java/CalculateService.java @@ -86,7 +86,7 @@ private static LinkedList divideOrMultiple(LinkedList expForCal) expForCal.pollFirst(); v = Double.parseDouble(queue.pollLast()) / Double.parseDouble(expForCal.poll()); - if (v.isInfinite()) { + if (v.isInfinite() || v.isNaN()) { System.out.print("0 으로 나눌 수 없습니다. "); throw new ArithmeticException(); } diff --git a/Calculator/src/main/java/Calculator.java b/Calculator/src/main/java/Calculator.java index 47c2243a6..2e480c42b 100644 --- a/Calculator/src/main/java/Calculator.java +++ b/Calculator/src/main/java/Calculator.java @@ -9,6 +9,7 @@ public class Calculator { private CalculateService calculateService; private static Map menus = new HashMap<>(); private StringBuilder menusBuilder = new StringBuilder(); + private CalculatorFunction calculatorFunction; public Calculator(ResultSaveService resultSaveService, CalculateService calculateService) { this.resultSaveService = resultSaveService; @@ -39,14 +40,16 @@ private void run() { while (true) { System.out.print(menusBuilder); - Scanner scanner = new Scanner(System.in); - int optionNumber = scanner.nextInt(); - CalculatorFunction calculatorFunction = menus.get(optionNumber); - calculatorFunction.doService(this); - } + try { + calculatorFunction = menus.get(scanner.nextInt()); + calculatorFunction.doService(this); + } catch (Exception e) { + System.out.println("입력이 올바르지 않습니다.\n"); + } + } } public ResultSaveService getResultSaveService() { diff --git a/Calculator/src/main/java/ResultSaveService.java b/Calculator/src/main/java/ResultSaveService.java index 3859a47c9..a9f3173c8 100644 --- a/Calculator/src/main/java/ResultSaveService.java +++ b/Calculator/src/main/java/ResultSaveService.java @@ -11,9 +11,9 @@ public ResultSaveService(String name) { @Override public void doService(Calculator calculator) { - System.out.println("ResultSaveService.doService"); if (results.size() == 0) { + System.out.println("[ 조회된 계산이력 없음 ]\n"); } else { StringBuilder savedResults = new StringBuilder(); From 78e8c721767d99439bb7dba76131f064ecb10138 Mon Sep 17 00:00:00 2001 From: ddongpuri Date: Sun, 11 Jun 2023 22:51:51 +0900 Subject: [PATCH 5/5] =?UTF-8?q?test=20:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Calculator/build.gradle | 2 + .../src/main/java/CalculateService.java | 12 +-- .../src/main/java/CalculatorFunction.java | 4 +- .../src/test/java/CalculateServiceTest.java | 78 +++++++++++++++++++ 4 files changed, 88 insertions(+), 8 deletions(-) create mode 100644 Calculator/src/test/java/CalculateServiceTest.java diff --git a/Calculator/build.gradle b/Calculator/build.gradle index 4cf7992b8..2ed2b1786 100644 --- a/Calculator/build.gradle +++ b/Calculator/build.gradle @@ -12,6 +12,8 @@ repositories { dependencies { testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2' + + testImplementation 'org.assertj:assertj-core:3.24.2' } test { diff --git a/Calculator/src/main/java/CalculateService.java b/Calculator/src/main/java/CalculateService.java index 6da30e9a6..370c3f034 100644 --- a/Calculator/src/main/java/CalculateService.java +++ b/Calculator/src/main/java/CalculateService.java @@ -39,11 +39,11 @@ public void doService(Calculator calculator) { } - private static String calculate(LinkedList expForCal) throws Exception { + public String calculate(LinkedList expForCal) throws Exception { return plusOrMinus(divideOrMultiple(expForCal)); } - private static String plusOrMinus(LinkedList expression) { + public String plusOrMinus(LinkedList expression) { Double sum = Double.valueOf(0); @@ -70,7 +70,7 @@ private static String plusOrMinus(LinkedList expression) { return String.valueOf(sum); } - private static LinkedList divideOrMultiple(LinkedList expForCal) throws Exception { + public LinkedList divideOrMultiple(LinkedList expForCal) throws Exception { Double v; @@ -104,7 +104,7 @@ private static LinkedList divideOrMultiple(LinkedList expForCal) return expForCal; } - private static String readExpression() { + public String readExpression() { Scanner scanner = new Scanner(System.in); String input = scanner.nextLine(); @@ -112,7 +112,7 @@ private static String readExpression() { return inputRefined; } - public static LinkedList fullTextParsing(String inputRefined) throws Exception { + public LinkedList fullTextParsing(String inputRefined) throws Exception { LinkedList equationElements = new LinkedList<>(); @@ -139,7 +139,7 @@ public static LinkedList fullTextParsing(String inputRefined) throws Exc return equationElements; } - public static boolean isValidFormula(String inputRefined) { + public boolean isValidFormula(String inputRefined) { boolean startWithNum = true; boolean onlyAllowed = true; diff --git a/Calculator/src/main/java/CalculatorFunction.java b/Calculator/src/main/java/CalculatorFunction.java index 463512a32..248dab951 100644 --- a/Calculator/src/main/java/CalculatorFunction.java +++ b/Calculator/src/main/java/CalculatorFunction.java @@ -2,6 +2,6 @@ public interface CalculatorFunction { String name = null; - public void doService(Calculator calculator); - public String getName(); + void doService(Calculator calculator); + String getName(); } diff --git a/Calculator/src/test/java/CalculateServiceTest.java b/Calculator/src/test/java/CalculateServiceTest.java new file mode 100644 index 000000000..fd277eafb --- /dev/null +++ b/Calculator/src/test/java/CalculateServiceTest.java @@ -0,0 +1,78 @@ +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import java.util.LinkedList; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatCode; +import static org.junit.jupiter.api.Assertions.*; + +class CalculateServiceTest { + + static private Calculator calculator; + static private CalculateService calculateService; + static private ResultSaveService resultSaveService; + + @BeforeEach + void setUp() { + resultSaveService = new ResultSaveService("조회"); + calculateService = new CalculateService("계산"); + calculator = new Calculator(resultSaveService, calculateService); + } + + @Test + @DisplayName("올바른 계산식") + void fullTextParsing() { + String inputRefined = "2+3/2*6"; + + assertThatCode(() -> calculateService.fullTextParsing(inputRefined)) + .doesNotThrowAnyException(); + } + + @Test + @DisplayName("유효하지 않은 연산자가 앞에 오는 경우") + void isValidFormula() { + + String badInput = "/2*4-3"; + assertThat(new CalculateService("test").isValidFormula(badInput)).isFalse(); + } + + @Test + @DisplayName("빼기 계산 검증") + public void calculate_test_minus() throws Exception { + + String goodInput = "1-10"; // -1 + LinkedList strings = calculateService.fullTextParsing(goodInput); + + Assertions.assertThat(calculateService.plusOrMinus(strings)).isEqualTo("-9"); + } + + @Test + @DisplayName("나누기 계산 검증") + public void calculate_test_divide() throws Exception { + String goodInput = "8/2"; // 4 + LinkedList strings = calculateService.fullTextParsing(goodInput); + + Assertions.assertThat(calculateService.calculate(strings)).isEqualTo("4"); + } + + @Test + @DisplayName("곱하기 계산 검증") + public void calculate_test_multiply() throws Exception { + String goodInput = "-2*1"; // -1 + LinkedList strings = calculateService.fullTextParsing(goodInput); + + Assertions.assertThat(calculateService.calculate(strings)).isEqualTo("-2"); + } + + @Test + @DisplayName("우선순위 계산 검증") + public void calculate_test_complex() throws Exception { + String goodInput = "3+2*4-1*3/3"; // 10 + LinkedList strings = calculateService.fullTextParsing(goodInput); + + Assertions.assertThat(calculateService.calculate(strings)).isEqualTo("10"); + } +} \ No newline at end of file