From d96ea14bbc8c80e4c0a0f4dc824e90da24a51000 Mon Sep 17 00:00:00 2001 From: BeommoKoo Date: Mon, 5 Jun 2023 03:07:04 +0900 Subject: [PATCH 01/16] need wiki --- .idea/.gitignore | 8 ++ .idea/misc.xml | 6 + .idea/modules.xml | 10 ++ .idea/uiDesigner.xml | 124 ++++++++++++++++++ .idea/vcs.xml | 6 + java-calculator.iml | 9 ++ .../java-calculator/.idea/.gitignore | 8 ++ out/production/java-calculator/.idea/misc.xml | 6 + .../java-calculator/.idea/modules.xml | 10 ++ .../java-calculator/.idea/uiDesigner.xml | 124 ++++++++++++++++++ out/production/java-calculator/.idea/vcs.xml | 6 + out/production/java-calculator/README.md | 69 ++++++++++ .../java-calculator/java-calculator.iml | 11 ++ out/production/src/Calculator$Ops.class | Bin 0 -> 1117 bytes out/production/src/Calculator.class | Bin 0 -> 2020 bytes out/production/src/Commander.class | Bin 0 -> 3284 bytes out/production/src/Memorizer.class | Bin 0 -> 1224 bytes out/production/src/Test$tt.class | Bin 0 -> 920 bytes out/production/src/Test.class | Bin 0 -> 726 bytes out/test/test/CalculatorTest.class | Bin 0 -> 891 bytes out/test/test/CommanderTest.class | Bin 0 -> 940 bytes out/test/test/test.iml | 28 ++++ src/src.iml | 11 ++ src/src/Calculator.java | 80 +++++++++++ src/src/Commander.java | 96 ++++++++++++++ src/src/Memorizer.java | 36 +++++ src/test/CalculatorTest.java | 15 +++ src/test/CommanderTest.java | 19 +++ src/test/test.iml | 28 ++++ 29 files changed, 710 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/uiDesigner.xml create mode 100644 .idea/vcs.xml create mode 100644 java-calculator.iml create mode 100644 out/production/java-calculator/.idea/.gitignore create mode 100644 out/production/java-calculator/.idea/misc.xml create mode 100644 out/production/java-calculator/.idea/modules.xml create mode 100644 out/production/java-calculator/.idea/uiDesigner.xml create mode 100644 out/production/java-calculator/.idea/vcs.xml create mode 100644 out/production/java-calculator/README.md create mode 100644 out/production/java-calculator/java-calculator.iml create mode 100644 out/production/src/Calculator$Ops.class create mode 100644 out/production/src/Calculator.class create mode 100644 out/production/src/Commander.class create mode 100644 out/production/src/Memorizer.class create mode 100644 out/production/src/Test$tt.class create mode 100644 out/production/src/Test.class create mode 100644 out/test/test/CalculatorTest.class create mode 100644 out/test/test/CommanderTest.class create mode 100644 out/test/test/test.iml create mode 100644 src/src.iml create mode 100644 src/src/Calculator.java create mode 100644 src/src/Commander.java create mode 100644 src/src/Memorizer.java create mode 100644 src/test/CalculatorTest.java create mode 100644 src/test/CommanderTest.java create mode 100644 src/test/test.iml 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/misc.xml b/.idea/misc.xml new file mode 100644 index 000000000..07115cdf1 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 000000000..7dfeef963 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 000000000..2b63946d5 --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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/java-calculator.iml b/java-calculator.iml new file mode 100644 index 000000000..8021953ed --- /dev/null +++ b/java-calculator.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/out/production/java-calculator/.idea/.gitignore b/out/production/java-calculator/.idea/.gitignore new file mode 100644 index 000000000..13566b81b --- /dev/null +++ b/out/production/java-calculator/.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/out/production/java-calculator/.idea/misc.xml b/out/production/java-calculator/.idea/misc.xml new file mode 100644 index 000000000..07115cdf1 --- /dev/null +++ b/out/production/java-calculator/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/out/production/java-calculator/.idea/modules.xml b/out/production/java-calculator/.idea/modules.xml new file mode 100644 index 000000000..eceb8f7e4 --- /dev/null +++ b/out/production/java-calculator/.idea/modules.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/out/production/java-calculator/.idea/uiDesigner.xml b/out/production/java-calculator/.idea/uiDesigner.xml new file mode 100644 index 000000000..2b63946d5 --- /dev/null +++ b/out/production/java-calculator/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/out/production/java-calculator/.idea/vcs.xml b/out/production/java-calculator/.idea/vcs.xml new file mode 100644 index 000000000..35eb1ddfb --- /dev/null +++ b/out/production/java-calculator/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/out/production/java-calculator/README.md b/out/production/java-calculator/README.md new file mode 100644 index 000000000..c1c982e55 --- /dev/null +++ b/out/production/java-calculator/README.md @@ -0,0 +1,69 @@ +# java_calculator +자바 계산기 구현 미션 Repository입니다. + +### 이곳은 공개 Repo입니다. +1. 여러분의 포트폴리오로 사용하셔도 됩니다. +2. 때문에 이 repo를 fork한 뒤 +3. 여러분의 개인 Repo에 작업하며 +4. 이 Repo에 PR을 보내어 멘토의 코드 리뷰와 피드백을 받으세요. + +### Branch 명명 규칙 + 팀의 PR규칙 정하기 +1. 여러분 repo는 알아서 해주시고 😀(본인 레포니 main으로 하셔두 되져) +2. prgrms-be-devcourse/spring-board 레포로 PR시 branch는 gituser_id을 적어주세요 :) + - base repo : `여기repo` base : `username` ← head repo : `여러분repo` compare : `main`또는 `github_id` +3. 실제 진행할 PR규칙은 멘토+팀원들과 정하여 진행해주세요 :) + - ← head repo : `여러분repo` compare : `main`로 할지 + - 또는 ← head repo : `여러분repo` compare : `github_id`로 할지 +- 참고 : [Github 위치 및 피드백 기준 가이드](https://www.notion.so/backend-devcourse/Github-e1a0908a6bbf4aeaa5a62981499bb215) + +### 과제를 통해 기대하는 역량 + +- 깃허브를 통한 코드리뷰를 경험해보자 +- 기본적인 테스트 코드 작성 및 활용하는 능력해보자 +- 스스로 OOP를 생각하고 코드로 옮길 수 있는 능력해보자 + +### 요구사항 +- 콘솔로 구현입니다.(스윙으로 구현하시는 분들 계실까봐) +- 객체지향적인 코드로 계산기 구현하기 + - [ ] 더하기 + - [ ] 빼기 + - [ ] 곱하기 + - [ ] 나누기 + - [ ] 우선순위(사칙연산) +- [ ] 테스트 코드 구현하기 +- [ ] 계산 이력을 맵으로 데이터 저장기능 만들기 + - 애플리케이션이 동작하는 동안 데이터베이스 외에 데이터를 저장할 수 있는 방법을 고안해보세요. +- (선택) 정규식 사용 + +### 실행결과(콘솔) +``` +1. 조회 +2. 계산 + +선택 : 2 + +1 + 2 +3 + +1. 조회 +2. 계산 + +선택 : 2 + +1 + 2 * 3 +7 + +1. 조회 +2. 계산 + +선택 : 1 + +1 + 2 = 3 +1 + 2 * 3 = 7 + +선택 : 2 + +3 - 2 * 2 +-1 +``` + diff --git a/out/production/java-calculator/java-calculator.iml b/out/production/java-calculator/java-calculator.iml new file mode 100644 index 000000000..56014c63f --- /dev/null +++ b/out/production/java-calculator/java-calculator.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/out/production/src/Calculator$Ops.class b/out/production/src/Calculator$Ops.class new file mode 100644 index 0000000000000000000000000000000000000000..3dea36554d36c077d6e7f14553c93f9893b27154 GIT binary patch literal 1117 zcmZuxYflqV5IwiM?Y8TMmhw<4C}PzL&iK0F$5;bkrJ5rPHnetiO3ZWE~|Fx=DrAwbEHK;c~xr&e}W^6Nd_(7cxl$R ziFxAPMQR<>n9(rFaTV8yz3p{T_g!eP{0jL!~fMz2(`xo-q=z!oc-A#%KpYAo&+KZefujQFVPcTxXaWrHU$R z#YPfwomN~(B9#PBA}zckM+s%Iu$-jFFj**GTA9fIrPZzOd)hW_y1uj9KWsU{zTNUD zlK)TF;>FuBWX*2d_8NBJin6Fy_3cBV$X?!d(pV|W?f7=s4+y6eiVb?+YTJu8 zUK}YDcd1_NyKXS(R<|Fto!73IHa*nKl6VxN+jV;3n{F@EP$lp%&%kTG?*#Hu92!L- z4Q{T`@p7cm_~xuoB0!eZCM{`9T9Ou!$q7jbB<1g;Omz>)TO=z!`T&`)m^#DsXYv@9 z=r7B_5-Y`44_y|bpXw3#s_rcW@3Ob>+&v1JVqs= zup$cMJ27N$D<{YwLy^uMRXUne)PE0V5;?Ot=(1bK@>?AZV2()G542g+j8+(kz zwrZuWkScYUYNmo4}$S`^-JxJ@-8Cxp#iv z{^2ozA>@2;!EHd3(BTnizHZ($qggYz5}jJQZl!Gj&tN8(v4;iR;hy;hc+p_MC$S4s zz&B!M)8(vb=ZggCIv|rZQQSb2fZs7)wlmr2jBTdZd}xHb0WD}X&?d1P0fDBP(&4E> zNkE%U&do5aI%`T0S8=>1u}3Mnrc*w2;B^BbiM`nOLKZW2F_T*n@UEJr)sg(N<>Zm@ z;(&mND7{XJLpaPlts7-COP_&oa%UCdJ&Rs+Q=`v|Fo#|*dO1W@4o4*VaFn4IENe|* zcev+ebpyu)T547kIon#XiatbfLgJ)~*_+AP^JcbeDVwJxV#=nwkT0kbotAh@rK+bA zlXEj_CN43kX0+5?a#mGiSmKORjnt@;pObi7LHB54Ubz{SIFB*9DVW8QMgKeUtkfyq zlThx*B@%d7z{r%&uNUlFPR$mTnWRJtla$<4p-x>B2!<2&30E_VD>Ks)7x12{Ou4iw z(EX~qzFaFGlW|k2vRVFQCTC5S*O#o~thtos_O&MSY_xf^m{GVosoAR;Zr!dG%TDA< zwwX(FWfQle)=+VQ1}Zx3N?|a3xz6|V^qH!iFK}-Yid$D)hUupB>+5E2S)lC|TI`*o zRVrs$Q&)+vmWtt8tJ8Jx#i(x;o<-ihbMatZSkJ0CObd<9sY#iIYRcZhbhdgjeKYxT zF>Q@yRDJxll#i;8V^t=tlAW?t4Ot_Z$mOi!NY*TsEJ8Pr6ArTGE?x+3_|%yq=TqI} zj6CQZHOhHIKwy?A%29CCdmli2N5+LYzLgkg#ysD$vH%N?dIK)v5@(ch$dSGZP@8))6cz+K=&q*-iKoo)3FP0<_eh?;)#qpH5M8Ke*CTk@@-z2gs1sIyN}A{?!#NkO UV~wLmX$!LCd=BTu`q_?u0Sk|qP5=M^ literal 0 HcmV?d00001 diff --git a/out/production/src/Commander.class b/out/production/src/Commander.class new file mode 100644 index 0000000000000000000000000000000000000000..4c9ca07f7e07b1235e522e612b78287090824145 GIT binary patch literal 3284 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 P3mqr@6RArSld${`#u)G^ literal 0 HcmV?d00001 diff --git a/out/production/src/Test$tt.class b/out/production/src/Test$tt.class new file mode 100644 index 0000000000000000000000000000000000000000..d9d22ce55a466699863d99064ee751b2357463da GIT binary patch literal 920 zcmZuvT~E_c7=BLM(X~_rH}~G zXt?%A8Q)XuR)W3gY2W90-sk-|zkYxF3E(wesE`=cLx04poNHiE3=}ZMAir&O8MJl= zIRYyh(4Z5)+I`bLYIPX&_hW(%1GiM@24*nJQ1HTGTN;1Rt((3s%S7RV8mcp_M}Bh_AjpN3_nnJv+W@A_me@- zj}P5mNRgHQxY*+%F_`V4=Z0N34g^0FDUmxMt$DLGS_uCXP$60;=tnM3V&ch`O}i;J zyfABRDJK*IXp9ZF9a>Unn8cpH8;JTevCvI1aLTYx-|vPauHqRP34}V{iy}WxN9~iZ z#CdazMl(nEMQT>W0;GcA!|@53QQ|Mz>eiJ$eo*&7g2+q2{tl8`8)B=Mfn0t=a4V4d=6C+hU1v%mg){|VqJ9($<3a$x&d!m_~nx%?=5u}sIklhL^f zwZQU|D2?f8%99S-D@Exr9SjC!vV*-1cMb?X#LjkwHa0D*1ulT5& zEK6(c;wm;AG<|Gh>z}rRPlZ+qv$82U8~t*iDC@n+qf`%cu4EEaaZSL}Y}O95WD`x8s}mU!-t4^l4_)SC<~J@0v)C*nurkmx{BR^Eiyqz}o93Z< z6`3hqbD0NbH-XwQ^&@3wB-4MLrYb*-Wl<=a6|J$u3$O5rS!QmXT7^2_m~w|!kEh_d zw0{Bdr3~MuG+|S;OX<%Ou!lReT-?PydQ5Rnn1Q!{zJ z!*#>8V7N`THuNgTTBY11uLZB{)10%=L6Goh{xv+HUBN>f@U$7P OaS4!NGzX8KZ~p~VsEgkK literal 0 HcmV?d00001 diff --git a/out/test/test/CalculatorTest.class b/out/test/test/CalculatorTest.class new file mode 100644 index 0000000000000000000000000000000000000000..dd06a8123a75e6eb111a81a78a85c7d2e63ea4ce GIT binary patch literal 891 zcmZuv+iuf95IvhXb>cb~5)x=>!CY%6O-+-+O8_aVK#F9FM60~;v`MY7kz)s6_yN9% zms0V-2k=pd*~E}m%|6WT+|Hbto!@_c{sQnCFEnJ3RiWs}VS}ME#oQme3?ppC*wci%COH?e8`^v>?0yuvVJreaV$k_Q zdHW^d9;rEVFtCOy9#P+`rqA4nI4j4&Ih8Iu!go)S*~ksg_{bwm)d`5&kcUF*sZohP z3j(ZMnVp2`F%>2mh^m3WF($H8pI{c~C5#=z*?Qg=V3)Y_Vn(65JXlz2p+ z4H&jQCVnht?odR6sP=t7hZuFvK`QiFkqw1e_UNm~ep z$Mmx4X42C90rq|2enL{ZW!O`adis8bJ<yR)d-45LhU6L6b{RJu9#MuA< literal 0 HcmV?d00001 diff --git a/out/test/test/CommanderTest.class b/out/test/test/CommanderTest.class new file mode 100644 index 0000000000000000000000000000000000000000..11864195390876848ff5cb79e5bdc4672a154bca GIT binary patch literal 940 zcmZuw+iuf95Ivil6US{51BKE8Ew?5u)P!<(KxzYhil{`QNGVdKO}eBT9J~0^|Kf=V z2|j?2Ld?cdlhFEM#xt{X=Ij~!&)=WF0lbB+BY~ublz}ud48;LI;`4a){@ zVuhhJCB5f)j^Hk_IpaxQ_=6 z>E4OxeN}LuXVBsoPmG)Eljc&fI)XOBLh)$quS|g! zX&#_{)B68BiddmP!iG7+qjm`ohSxMXfj9pEcJ0DX literal 0 HcmV?d00001 diff --git a/out/test/test/test.iml b/out/test/test/test.iml new file mode 100644 index 000000000..7f4fe5fa8 --- /dev/null +++ b/out/test/test/test.iml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/src.iml b/src/src.iml new file mode 100644 index 000000000..c90834f2d --- /dev/null +++ b/src/src.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/src/Calculator.java b/src/src/Calculator.java new file mode 100644 index 000000000..e59d9b0c3 --- /dev/null +++ b/src/src/Calculator.java @@ -0,0 +1,80 @@ +import java.util.Stack; + +public class Calculator { + + // for operation enum. + private enum Ops { PLUS, MINUS, MULT, DIV } + + // for Plus / Minus Operation. + private static Ops PM; + + // for Multiply / Divide Operation. + private static Ops MD; + + private static Calculator calculator = new Calculator(); + + private Calculator() {} + + public static Calculator getInstance() { return calculator; } + + public int calculate(String[] command) { + int result = 0; + Stack st = new Stack<>(); + + // 처음의 수를 더해주기 위함. + PM = Ops.PLUS; + for(int i = 0; i < command.length; i++) { + if(i % 2 == 1) { + switch (command[i]) { + // + or - : flush. + case "+" : + if(PM == Ops.PLUS) + result += st.peek(); + else + result -= st.peek(); + st.pop(); + // 이후 st.peek()를 더해줄지 빼줄지의 flag. + PM = Ops.PLUS; + break; + case "-" : + if(PM == Ops.PLUS) + result += st.peek(); + else + result -= st.peek(); + st.pop(); + PM = Ops.MINUS; + break; + // * or / : just memoizing. + case "*" : + MD = Ops.MULT; + break; + case "/" : + MD = Ops.DIV; + break; + } + } + + // 정수 -> 연산해서 stack push or 그냥 push. + else { + int tmp = Integer.parseInt(command[i]); + if(st.isEmpty()) + st.push(tmp); + else { + int top = st.peek(); + st.pop(); + if(MD == Ops.MULT) + st.push(top * tmp); + else + st.push(top / tmp); + } + } + } + + if(PM == Ops.PLUS) + result += st.peek(); + else + result -= st.peek(); + + return result; + } +} diff --git a/src/src/Commander.java b/src/src/Commander.java new file mode 100644 index 000000000..0f6a19e33 --- /dev/null +++ b/src/src/Commander.java @@ -0,0 +1,96 @@ +import java.io.IOException; +import java.util.InputMismatchException; +import java.util.Scanner; + +public class Commander { + + private static Memorizer memorizer = Memorizer.getInstance(); + + private static Calculator calculator = Calculator.getInstance(); + + + public static void getMenu() { + Scanner scanner = new Scanner(System.in); + try { + while(true) { + printMenu(); + int menu = scanner.nextInt(); + + if(menu == 3) { + System.out.println("Exit"); + break; + } + // 조회 + else if(menu == 1) { + memorizer.show(); + } + // 계산 + else if(menu == 2) { + // scanner buffer 비우기 위함. + scanner.nextLine(); + String command = scanner.nextLine(); + String[] commandArr = command.split(" "); + // commandArr check + if(!check(commandArr)) { + System.out.println("You've typed wrong menu!! Please re-type!!"); + scanner.nextLine(); + continue; + } + int result = calculator.calculate(commandArr); + System.out.println("result : " + result); + String resultStr = command + " = " + result; + memorizer.save(resultStr); + } + + else { + System.out.println("You've typed wrong menu!! Please re-type!!"); + scanner.nextLine(); + } + } + } + // Problem : + // 선택 : 2 + 3 / 2같은, nextint()를 이미 받아버리면 + // 정상작동한다. + catch (InputMismatchException e) { + System.out.println("You've typed wrong menu!! Please re-type!!"); + scanner.nextLine(); + } catch (NumberFormatException e) { + System.out.println("You've typed wrong menu!! Please re-type!!"); + scanner.nextLine(); + } + scanner.close(); + } + + public static boolean check(String[] command) { + for(String s : command) { + if(isDigit(s.charAt(0))) { + for(int i = 1; i < s.length(); i++) { + if(!isDigit(s.charAt(i))) + return false; + } + } + else { + if( (s.equals("+") || s.equals("-") || s.equals("*") || s.equals("/") ) == false ) + return false; + } + } + + return true; + } + + public static boolean isDigit(char c) { + if((int)c - '0' >= 0 && (int)c - '0' <= 9) + return true; + return false; + } + private static void printMenu() { + System.out.println("1. 조회"); + System.out.println("2. 계산"); + System.out.println(); + System.out.print("선택 : "); + } + + public static void main(String[] args) { + getMenu(); + } +} diff --git a/src/src/Memorizer.java b/src/src/Memorizer.java new file mode 100644 index 000000000..01351c246 --- /dev/null +++ b/src/src/Memorizer.java @@ -0,0 +1,36 @@ +import java.util.LinkedList; +import java.util.Queue; + +public class Memorizer { + + private static Memorizer memorizer = new Memorizer(); + + private Queue history; + private Memorizer() { + this.history = new LinkedList<>(); + } + + public static Memorizer getInstance() { + return memorizer; + } + + public void save(String result) { + history.add(result); + } + + public void show() { + int times = history.size(); + + if(times == 0) { + System.out.println("there is no history.."); + return; + } + + while(times > 0) { + String result = history.poll(); + System.out.println(result); + times--; + history.add(result); + } + } +} diff --git a/src/test/CalculatorTest.java b/src/test/CalculatorTest.java new file mode 100644 index 000000000..aec5d9eb9 --- /dev/null +++ b/src/test/CalculatorTest.java @@ -0,0 +1,15 @@ +import org.junit.jupiter.api.Test; +//import Calculator; +import static org.junit.jupiter.api.Assertions.*; + +class CalculatorTest { + + @Test + void calculateTest() { + Calculator calculator = Calculator.getInstance(); + String command = "1 + 2 * 23 - 32"; + String[] commandArr = command.split(" "); + int result = calculator.calculate(commandArr); + assertEquals(15, result); + } +} \ No newline at end of file diff --git a/src/test/CommanderTest.java b/src/test/CommanderTest.java new file mode 100644 index 000000000..e2c531dfe --- /dev/null +++ b/src/test/CommanderTest.java @@ -0,0 +1,19 @@ +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +public class CommanderTest { + + @Test + void isDigitTest() { + assertTrue(Commander.isDigit('1')); + assertFalse(Commander.isDigit('^')); + } + + @Test + void checkTest() { + assertEquals(false, Commander.check(new String[] {"1", "^"})); + assertEquals(true, Commander.check(new String[] {"1", "+", "3"})); + } +} diff --git a/src/test/test.iml b/src/test/test.iml new file mode 100644 index 000000000..7f4fe5fa8 --- /dev/null +++ b/src/test/test.iml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 03904129cec37f7f2e69bbe4653f0ea8b26a318c Mon Sep 17 00:00:00 2001 From: BeommoKoo Date: Mon, 5 Jun 2023 03:18:04 +0900 Subject: [PATCH 02/16] project end. need wiki --- src/src/Calculator.java | 1 + src/src/Commander.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/src/Calculator.java b/src/src/Calculator.java index e59d9b0c3..2c81e9fa9 100644 --- a/src/src/Calculator.java +++ b/src/src/Calculator.java @@ -70,6 +70,7 @@ public int calculate(String[] command) { } } + // 마지막 command의 숫자까지 처리. if(PM == Ops.PLUS) result += st.peek(); else diff --git a/src/src/Commander.java b/src/src/Commander.java index 0f6a19e33..1814e43f1 100644 --- a/src/src/Commander.java +++ b/src/src/Commander.java @@ -83,6 +83,7 @@ public static boolean isDigit(char c) { return true; return false; } + private static void printMenu() { System.out.println("1. 조회"); System.out.println("2. 계산"); From 90a46bec624ce53e55a5fd67e01f767f1d78f332 Mon Sep 17 00:00:00 2001 From: BeommoKoo Date: Mon, 5 Jun 2023 11:04:09 +0900 Subject: [PATCH 03/16] =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=EC=BC=80?= =?UTF-8?q?=EC=9D=B4=EC=8A=A4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- out/production/src/Calculator.class | Bin 2020 -> 2020 bytes out/production/src/Commander.class | Bin 3284 -> 3277 bytes out/production/src/Memorizer.class | Bin 1224 -> 1229 bytes out/production/src/Test$tt.class | Bin 920 -> 0 bytes out/production/src/Test.class | Bin 726 -> 0 bytes out/production/src/src.iml | 12 ++++++++++ out/test/test/CalculatorTest.class | Bin 891 -> 1313 bytes out/test/test/CommanderTest.class | Bin 940 -> 1635 bytes src/src.iml | 1 + src/src/Commander.java | 24 ++++++++++++-------- src/test/CalculatorTest.java | 34 ++++++++++++++++++++++++---- src/test/CommanderTest.java | 18 +++++++++++---- 12 files changed, 72 insertions(+), 17 deletions(-) delete mode 100644 out/production/src/Test$tt.class delete mode 100644 out/production/src/Test.class create mode 100644 out/production/src/src.iml diff --git a/out/production/src/Calculator.class b/out/production/src/Calculator.class index 863fc1ea2aa3a62c335f63474f8db81c8486598f..9acd6d6751e6767fb3f417d16e2e067f72a025c7 100644 GIT binary patch delta 87 zcmaFD|Ac=-JsYbugA#+x1|vpQ1`|eY1~W!I25Uxh1{+2@23tmN27AVE r1_#C%21mwJ1}DZ+1{cOA1}Vl41~0~m4Bm_j8GISnG5AmZ!S)6K(4G;2 delta 87 zcmaFD|Ac=-JsYbGgA#-6B>^?kxh&Egi3()<>UV|qhDusPZOtX?qaBg9=8B>%8nzQvK%&}VAdH=6 zvEq%j&{nKr7lmI#D@BRC(Pp3>69w$8;kM>zi!{ArpaY#WHMN8~mN1Ost1YV5(8Y3= z&Gg*5FmOA5Lc>08%V&CiAMU<&ctCdLfNY6f!>c^F)!lph$T`nK)^;jhH*m-&vD)@9 zMRsrk-Z1c{M5i`~qYdGMb@tx-l48V1diYM%0)z;rW9%{Bk9XWCUH1tyPeRr4=3 zCq}}MVY+NArOF1`VCQ;_yAn!4Y4cx&7^Gssajx>1M!d__7}HPSJ?n%B@2$R_NP#ak2#}fIR8Cl zJw`HY3);L2|2-I% zr79ZNsMwT22Jn+H$^iVr6s&x^)>@VCzi|;O{rTnf`L;cA7=aXCh+~$uFBWixl4y!! za=_J`RLF4Ac&&?t za+hUu$nVb>!qa02{nko1nX>yLY3WX4PgTCNbjMj3QaBx#(wPfp{@Y`jPfSloYy)Sn z5l(DmdYee64P?WXhv_;A=ri;(jD;;YpKcb&6A587TPKteSi}e>iF@GBMt?c~4IxV) z(E$aL&jo(s*B|x68a~ b!52tSW>Wi-ulv*M0ETGOxgRE3uOjbXruA9M delta 1877 zcmY*ZYgANK6#mZ4y>ste?jR1LjEIcl0|t;sA`19^C#Y$uP-=)1jPX!r@Rc>D^j0%( zSz;EVHCa>wHICS_RjajHtH;0o^{ch|)x!Vfv+vx2NLX{uK4+i3_qV^j_x;uPo6q>^ z{?JVT3vr|07$*!bWxt7Om~P#1lz9xyz)TIZOw2}}RU+nZ(-9C*RvrvR+(<{Ei6YDq zaJL3q+dD#sgB=1XHMOIMDgz}b)lg>Q5xDs5KMj3^o7)c<&`@q-9xAN3nBiR@Ap8cZ zP_1F1iA7j!4U4s|r6!hPxmD%J6)UZsj#AfZ6Kk;6I_sF4vJN#GYE7)i2J2hLT#ta? z3kNpI95!1O&ccimJYixB@?^+{{Xq@e_{RE1^}96G3*=aTs5wyy+(TX-|g8MofTEYSuc{O_)_BRx_Sbk+(bT8i(=^%w7po1<&v5x&@t#pom z_~O-D-6wP$qYxO5z$Vz{g4*6|DeN>VrjFPMnRq}9D0p|*&` z{Gy3tGC!>;7^w}mb;{y&nRp2=vuI60>vttfUx!!a&1-}Am2%-eLkuDQ!dA7bE%j3a zpP^5~=aSnmtc2@_oT~zQD_t?B&@mujbOghlEs^B;E9<1@Q?3cjw6e8H)*V+WDZef- z)jkeu*-fvn~ zQZb&@_AI4WfQ*#&p!vco&~GVJ7ylox;e&QRI`z z0M4KQ@32Z2=%N>;3|__X<+#G3?MDSOtipB7#}F3adsN~_RO4rck>%M0ok3RNO`In1 z%~*`L=+8<2Ik50Hlqf^!bbp%lOy{$+ycBfp!Mk{m(vU5kqm+X0(2etS`aXZNVBAHD z2JJ3#h36g$HB@Q1@DBpFVLFy+*t$_eorfL4??$pCghB|iBaQ@W3T`fRF3O(Li|D?B z?6OM5r#R!-k-)BV$W!L28LCf-8;axEZcL-p zZcCFW?Xx8hr7)#)(3BVyXVTP3)6+^H0VE3+VApd%m#|h#kxiTdBCWs*(zuNOYtX@w zh){nRwKkc48v04x2joblRUX_|ZB5p(Z zo0e|*;YxCX=mwG^$7#akw36NDkt(+|_a&%GpK}arDno-koW_cJS;w)_n}8l%90~1& z@G_~1qcg}J;~4TUM>cjRM?vlfl6xG7c#3+Ti{p7Y+rsYRiNptft9ABw8n)3_9ecH& zn0s+)1aq1F8c-5AI`&mC>{#0gbjSbTDY$GiqqA*CKP&lm!km=^j&B-7K?1J~V$~Ri nq$iE<-SqY`qd5>`%abIYuh9BSd+oQ^L3~Y(!P__z>{s8v?QUL) diff --git a/out/production/src/Memorizer.class b/out/production/src/Memorizer.class index 154790b4d1ef01fe028f24165573e5dce802b9a5..4a3842eb66c684c3e5b1599f98683c1899297ea0 100644 GIT binary patch delta 145 zcmWlSPYQxi9E3mL6T(-xC`wbZ*B?S!804ZBN_CU&w(7JuLlsP*rdlr-| iIkVy*w3XSEF@>b+f54HEsFC(0lp_iBP#r;Cx#bVjc@w?> delta 140 zcmWNJK?;IU6h)8zApC)YB1=te5D5-~2&#di?W08n&e}vF610OREuozhba`;!dzZs` zdoS<)G1(0l12jdCeG)m8@s&|WI$k|kw?DHx7g!O2a)!@bS4gDEiP^AVOF~IXO~ygw eQpTLAx=MDrIWp0rH}~G zXt?%A8Q)XuR)W3gY2W90-sk-|zkYxF3E(wesE`=cLx04poNHiE3=}ZMAir&O8MJl= zIRYyh(4Z5)+I`bLYIPX&_hW(%1GiM@24*nJQ1HTGTN;1Rt((3s%S7RV8mcp_M}Bh_AjpN3_nnJv+W@A_me@- zj}P5mNRgHQxY*+%F_`V4=Z0N34g^0FDUmxMt$DLGS_uCXP$60;=tnM3V&ch`O}i;J zyfABRDJK*IXp9ZF9a>Unn8cpH8;JTevCvI1aLTYx-|vPauHqRP34}V{iy}WxN9~iZ z#CdazMl(nEMQT>W0;GcA!|@53QQ|Mz>eiJ$eo*&7g2+q2{tl8`8)B=Mfn0t=a4V4d=6C+hU1v%mg){|VqJ9($<3a$x&d!m_~nx%?=5u}sIklhL^f zwZQU|D2?f8%99S-D@Exr9SjC!vV*-1cMb?X#LjkwHa0D*1ulT5& zEK6(c;wm;AG<|Gh>z}rRPlZ+qv$82U8~t*iDC@n+qf`%cu4EEaaZSL}Y}O95WD`x8s}mU!-t4^l4_)SC<~J@0v)C*nurkmx{BR^Eiyqz}o93Z< z6`3hqbD0NbH-XwQ^&@3wB-4MLrYb*-Wl<=a6|J$u3$O5rS!QmXT7^2_m~w|!kEh_d zw0{Bdr3~MuG+|S;OX<%Ou!lReT-?PydQ5Rnn1Q!{zJ z!*#>8V7N`THuNgTTBY11uLZB{)10%=L6Goh{xv+HUBN>f@U$7P OaS4!NGzX8KZ~p~VsEgkK diff --git a/out/production/src/src.iml b/out/production/src/src.iml new file mode 100644 index 000000000..6e2c7755a --- /dev/null +++ b/out/production/src/src.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/out/test/test/CalculatorTest.class b/out/test/test/CalculatorTest.class index dd06a8123a75e6eb111a81a78a85c7d2e63ea4ce..dac06c8154db4f319177baed0afae99f9626a252 100644 GIT binary patch delta 780 zcmaKqO-~b16o%hB_RGm=>rje7p%>et&IoO%v_%jE!G(nALN_iawMI!RrXM861<|lD zN{r2jF^Y+enz$^HlExT*fIq^x?zHg-7>#F2W!c4?&-dIp_sRY3sEFeCzhCzO%wVxB z=Cqy!SGdMio}Azj9@qF7PaTB^C!CNa^uWt-d_m8qOIf|Rn!k}L6pbG&;B~>rz_^H$ z=yzg3!XW(Rx0gk0bXYWxY`jWZ06e5O#!7U_&DA{3}j zoRctyal_B1mRyK3$gu=1^nbfaiZvHBs$0v(G|H2-Yn--ExiG=tO;M^@`Zx)+C<$Uw zV}-355y3A6myH1Ptt{Rx+|TL{uIjnWG=qIj&z3R_*V3H}W?EaHn@?VwPhWEL-A41( zZqukX>Q%F{&0CwB&1XC2i*24>&E@oax90PC^V2up__EP_Ty1T&hYrTa8T{?v8EHXP zJrIcY5&8%wSy*t|ovBtw$$DTTFA|hK!V*L;RC-G>-08lnsOqIH{iyOk)(qK~&YqmPKgHEge(7kT=`hHP+ z9KL4#vdY_vNVnY^boyd{?!Ra`|2Wiq+CY?cy`$cOaY68ZEKQ1n z*6h5+wp6eqQ!Nlb3x}nXonTxf?8{2R8MAOzu8vtc(&J7_pRhVJy_b6#QNkQLCI<7w z#5;v84~zv#jj0>cBwfB>my)C#q$yL8v=|Om_6UhCD$5^;S4}+s_w|GobwQ2BA9GhM A?*IS* diff --git a/out/test/test/CommanderTest.class b/out/test/test/CommanderTest.class index 11864195390876848ff5cb79e5bdc4672a154bca..d986960b5fa141ccb7df18fb0b277170f240d634 100644 GIT binary patch literal 1635 zcmZ`(-%}e^6#i}qB&6G>Y%MJ<;9<=!2mC%YdhSLk`BQ=^-jk)O5?1GlaGPK>$4Ly5{p(WHerp=tj;0-+xJUSUzuYfu)p-bSLaGb`~WJdGj zBK_|7<7I}{LFKA4)Q(r6_;5+WW%M$fJm5R6Wr(RS;qYgWk5l&JRYFq&xQ37qeG_FBsPiZ8Ddd)y!#iHc2~jJe^RJGpebJwY%xf z&g+yZ7(ddd7C5IrN}{`ScMv6tED9+F|V4|&t=!KPpLgwwN`d& zg>`FXYk;Bqf65U;P#x`dHyu^}vF8nyD79jNuWazORmIxgtnNLDC@w>Vua)?6iMSr$ z5X7j;YAMePj}>dV$ctMfj$M&cpS7_sSo5u~tEI;_x~+x?to~W%n|a5b|6y!-I?~Hho|s zEO$RcPdHpgk9_4hu0BJgrGnRK9jV|gnpN;_SiaTh<8Ab*GwgwnQgu?QbM!8s#}#^2 b!?=L!xQKh`KE!sSIor6+mf<6U@nG^l$|n7B delta 535 zcmZuuJx>Bb5Pf@qhsT1)p@^cQBFcw&A}R`4k=R;bg9XV2FZcl%Ibut1NA4Hc+ZYQk zCK_%18~zXD91x+fnYS~u^WK}?Z~iDsUq7$!0FF@TNvcCG@DxMTyLN1M#sDr4D;EMGC!Qr?iK{v3~+#WF+p*gGL?`Kx{@zoPjnEFp=h`5 zxI>W-E+C6t%78tp3;p5JaM&+rEQl7oaPd!f;5^0`k8;#ztlU diff --git a/src/src.iml b/src/src.iml index c90834f2d..6e2c7755a 100644 --- a/src/src.iml +++ b/src/src.iml @@ -3,6 +3,7 @@ + diff --git a/src/src/Commander.java b/src/src/Commander.java index 1814e43f1..82eb7cb38 100644 --- a/src/src/Commander.java +++ b/src/src/Commander.java @@ -4,6 +4,7 @@ public class Commander { + // memorizer, calculator : Singleton. private static Memorizer memorizer = Memorizer.getInstance(); private static Calculator calculator = Calculator.getInstance(); @@ -62,11 +63,12 @@ else if(menu == 2) { } public static boolean check(String[] command) { - for(String s : command) { - if(isDigit(s.charAt(0))) { - for(int i = 1; i < s.length(); i++) { - if(!isDigit(s.charAt(i))) - return false; + String s; + for(int i = 0; i < command.length; i++) { + s = command[i]; + if(i % 2 == 0) { + if(!isDigit(s)) { + return false; } } else { @@ -78,10 +80,14 @@ public static boolean check(String[] command) { return true; } - public static boolean isDigit(char c) { - if((int)c - '0' >= 0 && (int)c - '0' <= 9) - return true; - return false; + // ASCII값으로 판정. + public static boolean isDigit(String s) { + for(int i = 0; i < s.length(); i++) { + char c = s.charAt(i); + if((int)c - '0' < 0 || (int)c - '0' > 9) + return false; + } + return true; } private static void printMenu() { diff --git a/src/test/CalculatorTest.java b/src/test/CalculatorTest.java index aec5d9eb9..5ec4f7e5a 100644 --- a/src/test/CalculatorTest.java +++ b/src/test/CalculatorTest.java @@ -1,15 +1,41 @@ +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; //import Calculator; import static org.junit.jupiter.api.Assertions.*; class CalculatorTest { + String command; + String[] commandArr; + int result; + @DisplayName("calculate함수는 띄어쓰기로 파싱된 commandArr를 계산하는 함수.") @Test void calculateTest() { + // case 테스트마다 commandArr, result 갱신해주는거 불편하다. + // 매크로로 못 선언하나 ? Calculator calculator = Calculator.getInstance(); - String command = "1 + 2 * 23 - 32"; - String[] commandArr = command.split(" "); - int result = calculator.calculate(commandArr); - assertEquals(15, result); + // 1. * + / - + command = "5 * 2 + 64 / 32 - 7"; + commandArr = command.split(" "); + result = calculator.calculate(commandArr); + assertEquals(5, result); + + // 2. / * + / + command = "15 / 5 * 2 + 8 / 2"; + commandArr = command.split(" "); + result = calculator.calculate(commandArr); + assertEquals(10, result); + + // 3. + / - * + command = "2 + 12 / 6 - 3 * 7"; + commandArr = command.split(" "); + result = calculator.calculate(commandArr); + assertEquals(-17, result); + + // 4. - * + / + command = "7 - 25 * 3 + 20 / 10"; + commandArr = command.split(" "); + result = calculator.calculate(commandArr); + assertEquals(-66, result); } } \ No newline at end of file diff --git a/src/test/CommanderTest.java b/src/test/CommanderTest.java index e2c531dfe..2a793dc10 100644 --- a/src/test/CommanderTest.java +++ b/src/test/CommanderTest.java @@ -5,15 +5,25 @@ public class CommanderTest { + String command; + String[] commandArr; + + @DisplayName("isDigit함수는 input으로 들어온 String의 첫번째 문자를 검사하여 숫자인지, String인지(첫번째 문자가 char면 String) 판단한다.") @Test void isDigitTest() { - assertTrue(Commander.isDigit('1')); - assertFalse(Commander.isDigit('^')); + assertTrue(Commander.isDigit("123")); + assertFalse(Commander.isDigit("#")); + assertFalse(Commander.isDigit("+")); } + @DisplayName("check함수는 input 형식에 맞게, 숫자 연산자 숫자 연산자 가 번갈아 나오는지, 숫자라면 중간에 문자가 껴있는지 체크하고, 연산자라면 사칙연산의 연산자인지 체크한다.") @Test void checkTest() { - assertEquals(false, Commander.check(new String[] {"1", "^"})); - assertEquals(true, Commander.check(new String[] {"1", "+", "3"})); + command = "1 & 2"; + commandArr = command.split(" "); + assertEquals(false, Commander.check(commandArr)); + command = "1 + 3"; + commandArr = command.split(" "); + assertEquals(true, Commander.check(commandArr)); } } From 247002d0eb5ce498695d8ee5170ddd6777b6037e Mon Sep 17 00:00:00 2001 From: BeommoKoo Date: Mon, 5 Jun 2023 12:00:33 +0900 Subject: [PATCH 04/16] =?UTF-8?q?calculator=20test=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EA=B0=84=EA=B2=B0=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- out/test/test/CalculatorTest.class | Bin 1313 -> 1312 bytes src/test/CalculatorTest.java | 26 +++++++++++--------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/out/test/test/CalculatorTest.class b/out/test/test/CalculatorTest.class index dac06c8154db4f319177baed0afae99f9626a252..5130ee1add7e256d900723c4151aa2147169a41f 100644 GIT binary patch delta 567 zcmY+AO;1xn6o#L8ks{suywcJFMm$FG757iN?=CMCnezVI&ihX7w9`GVy}md*=^k$`wlxpP zxQu&bnXor%OHJB8Dw}(#@I#l?y0|pOq#?GgI5RfwWK$Z$oXfmNo=coPPOxZWF!koqdVzQ(W ziLgpN+8eCN9<$f6_7$HbMagkL@ZBFI;z978M4#bX#sWVlWJKRVQz80$2Th0Q*MI1n z=s7ecmPkk(We8us3=@n~BqvQx@`!1!wwYm%Sz40j4GNKq4LNPf8Wx!?p^wkm=81q% z%NMXNe;v8J7m{0MUsn8LpM_UT)jrj)0tfc#sQ-CM%af!Kxdekp1DA577!F7YPO-yN Rd76}Z!(oM!c@~L1{|9V*Ox6GZ delta 586 zcmaKp&rTCj6o1uplgX6t=#CX9Qh#anCuwd%pZ~&b>$aSpQh=(|Gi{XrC;;eXC~G!*+8x z8_@3(`aB}v{!q(%3@Vh-3^U>~>N7^c{!%Y>F98!ik1;mulyvGg=~JR?Z&jt7cBg!% zd7^l*x3mA{<7csHX(FmF&wOT>ZQnFs)f8d8VCKw%iA-XuW=ZPABa!=5#);@fGh^z~ zZ+Ofr@(qzm%GU)*Y68SHyW+gJuQLVv)48&rGNodG17zgLA`(d_{hMVb$&NkCv<_53 zkQ6+<#NCd4C quW=%e(GaV_yH{X|Wl=pGu|gBYb5S|ztxCPN&kNS&La`yyVe=1Qa9UXa diff --git a/src/test/CalculatorTest.java b/src/test/CalculatorTest.java index 5ec4f7e5a..001ae29f8 100644 --- a/src/test/CalculatorTest.java +++ b/src/test/CalculatorTest.java @@ -6,36 +6,32 @@ class CalculatorTest { String command; - String[] commandArr; - int result; + @DisplayName("calculate함수는 띄어쓰기로 파싱된 commandArr를 계산하는 함수.") @Test void calculateTest() { // case 테스트마다 commandArr, result 갱신해주는거 불편하다. // 매크로로 못 선언하나 ? - Calculator calculator = Calculator.getInstance(); // 1. * + / - command = "5 * 2 + 64 / 32 - 7"; - commandArr = command.split(" "); - result = calculator.calculate(commandArr); - assertEquals(5, result); + assertEquals(5, input(command)); // 2. / * + / command = "15 / 5 * 2 + 8 / 2"; - commandArr = command.split(" "); - result = calculator.calculate(commandArr); - assertEquals(10, result); + assertEquals(10, input(command)); // 3. + / - * command = "2 + 12 / 6 - 3 * 7"; - commandArr = command.split(" "); - result = calculator.calculate(commandArr); - assertEquals(-17, result); + assertEquals(-17, input(command)); // 4. - * + / command = "7 - 25 * 3 + 20 / 10"; - commandArr = command.split(" "); - result = calculator.calculate(commandArr); - assertEquals(-66, result); + assertEquals(-66, input(command)); + } + + int input(String command) { + Calculator calculator = Calculator.getInstance(); + String[] commandArr = command.split(" "); + return calculator.calculate(commandArr); } } \ No newline at end of file From f937877fc82322ec3830c39c12371341508febd8 Mon Sep 17 00:00:00 2001 From: BeommoKoo Date: Tue, 6 Jun 2023 14:19:31 +0900 Subject: [PATCH 05/16] backu --- .gradle/7.4/checksums/checksums.lock | Bin 0 -> 17 bytes .gradle/7.4/checksums/md5-checksums.bin | Bin 0 -> 19347 bytes .gradle/7.4/checksums/sha1-checksums.bin | Bin 0 -> 20387 bytes .../dependencies-accessors.lock | Bin 0 -> 17 bytes .../7.4/dependencies-accessors/gc.properties | 0 .../7.4/executionHistory/executionHistory.bin | Bin 0 -> 32078 bytes .../executionHistory/executionHistory.lock | Bin 0 -> 17 bytes .gradle/7.4/fileChanges/last-build.bin | Bin 0 -> 1 bytes .gradle/7.4/fileHashes/fileHashes.bin | Bin 0 -> 19647 bytes .gradle/7.4/fileHashes/fileHashes.lock | Bin 0 -> 17 bytes .../7.4/fileHashes/resourceHashesCache.bin | Bin 0 -> 18973 bytes .gradle/7.4/gc.properties | 0 .../buildOutputCleanup.lock | Bin 0 -> 17 bytes .gradle/buildOutputCleanup/cache.properties | 2 + .gradle/buildOutputCleanup/outputFiles.bin | Bin 0 -> 18983 bytes .gradle/file-system.probe | Bin 0 -> 8 bytes .gradle/vcs-1/gc.properties | 0 .idea/.gitignore | 8 - .idea/compiler.xml | 6 + .idea/gradle.xml | 18 ++ .idea/jarRepositories.xml | 20 ++ .idea/misc.xml | 6 +- .idea/modules.xml | 10 - .idea/vcs.xml | 2 +- .idea/workspace.xml | 251 ++++++++++++++++++ build.gradle | 25 ++ build/classes/java/main/CalculatorTest.class | Bin 0 -> 1299 bytes build/classes/java/main/Commander.class | Bin 0 -> 3292 bytes build/classes/java/main/CommanderTest.class | Bin 0 -> 1640 bytes build/classes/java/main/Memorizer.class | Bin 0 -> 1229 bytes .../java/main/View/Calculator$Ops.class | Bin 0 -> 1152 bytes build/classes/java/main/View/Calculator.class | Bin 0 -> 2045 bytes .../java/main/main/Calculator$Ops.class | Bin 0 -> 1152 bytes build/classes/java/main/main/Calculator.class | Bin 0 -> 2045 bytes build/classes/java/main/main/Commander.class | Bin 0 -> 3317 bytes build/classes/java/main/main/Memorizer.class | Bin 0 -> 1244 bytes build/classes/java/test/CalculatorTest.class | Bin 0 -> 1298 bytes build/classes/java/test/CommanderTest.class | Bin 0 -> 1635 bytes build/classes/java/test/test.iml | 28 ++ .../compileJava/previous-compilation-data.bin | Bin 0 -> 1351 bytes gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59821 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 234 ++++++++++++++++ gradlew.bat | 89 +++++++ src/{src => main/java}/Commander.java | 5 +- src/{src => main/java}/Memorizer.java | 0 src/{src => main/java/View}/Calculator.java | 6 +- src/main/java/View/InputView.java | 5 + src/test/CalculatorTest.java | 9 +- 49 files changed, 700 insertions(+), 29 deletions(-) create mode 100644 .gradle/7.4/checksums/checksums.lock create mode 100644 .gradle/7.4/checksums/md5-checksums.bin create mode 100644 .gradle/7.4/checksums/sha1-checksums.bin create mode 100644 .gradle/7.4/dependencies-accessors/dependencies-accessors.lock create mode 100644 .gradle/7.4/dependencies-accessors/gc.properties create mode 100644 .gradle/7.4/executionHistory/executionHistory.bin create mode 100644 .gradle/7.4/executionHistory/executionHistory.lock create mode 100644 .gradle/7.4/fileChanges/last-build.bin create mode 100644 .gradle/7.4/fileHashes/fileHashes.bin create mode 100644 .gradle/7.4/fileHashes/fileHashes.lock create mode 100644 .gradle/7.4/fileHashes/resourceHashesCache.bin create mode 100644 .gradle/7.4/gc.properties create mode 100644 .gradle/buildOutputCleanup/buildOutputCleanup.lock create mode 100644 .gradle/buildOutputCleanup/cache.properties create mode 100644 .gradle/buildOutputCleanup/outputFiles.bin create mode 100644 .gradle/file-system.probe create mode 100644 .gradle/vcs-1/gc.properties delete mode 100644 .idea/.gitignore create mode 100644 .idea/compiler.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/modules.xml create mode 100644 .idea/workspace.xml create mode 100644 build.gradle create mode 100644 build/classes/java/main/CalculatorTest.class create mode 100644 build/classes/java/main/Commander.class create mode 100644 build/classes/java/main/CommanderTest.class create mode 100644 build/classes/java/main/Memorizer.class create mode 100644 build/classes/java/main/View/Calculator$Ops.class create mode 100644 build/classes/java/main/View/Calculator.class create mode 100644 build/classes/java/main/main/Calculator$Ops.class create mode 100644 build/classes/java/main/main/Calculator.class create mode 100644 build/classes/java/main/main/Commander.class create mode 100644 build/classes/java/main/main/Memorizer.class create mode 100644 build/classes/java/test/CalculatorTest.class create mode 100644 build/classes/java/test/CommanderTest.class create mode 100644 build/classes/java/test/test.iml create mode 100644 build/tmp/compileJava/previous-compilation-data.bin 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 rename src/{src => main/java}/Commander.java (96%) rename src/{src => main/java}/Memorizer.java (100%) rename src/{src => main/java/View}/Calculator.java (95%) create mode 100644 src/main/java/View/InputView.java diff --git a/.gradle/7.4/checksums/checksums.lock b/.gradle/7.4/checksums/checksums.lock new file mode 100644 index 0000000000000000000000000000000000000000..e3ca360a53ce048509ae3e911fc677bb3abf926d GIT binary patch literal 17 UcmZQBas2Hyb;=f21_-bL05O;Z8~^|S literal 0 HcmV?d00001 diff --git a/.gradle/7.4/checksums/md5-checksums.bin b/.gradle/7.4/checksums/md5-checksums.bin new file mode 100644 index 0000000000000000000000000000000000000000..6d1b10039bddbb2368742d7582f96b6ac3e998c7 GIT binary patch literal 19347 zcmeI(`%6<%00;1^JN|KtdS_U@k zt#x9x@rg2Z8j zEyC#HGJ1$32tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00jOQftBP&Cexdd_*fec z?6U-6wul@!=BGW6KYQR*0zEBn=D!~_O^#EEcYBV|JUoNvZ#svf44R{lS$>Y^T|Hsh zSyjgjY@E$J|ME6(j=tP&kmeC7JRdyKH?=}&ET(y6BF~3cDf>e7&)D_htvnxpwaVa8 zUht638_M%Zb_MJG+$UzRar}5bqjbrLm-MoV=JL}#51c=5U|>#i3C$z?c^<6G{OHu2 z%*Kxx$MYq1iqG~BJImQPwmgq%T9*}&?e>F>qvLsO;_vEeeRLYj|L{DqZ0!WE*rexd zoCQ2jz1|?##|%zk*O&2}?*+lClAgmB0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_ z009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AV3A?lASkMJ&dbERnB?$+ny`a zhu4HWb-DD~nfwzy|4>BzO?qv@9FIu<#L&GC~qtcNWdFTMBIZIt)xP8K?Sh>dhQM;fYjd)Zyua2cba zc8G3ny`WM>O1iFe3&mt?av!S|VYD&b*K&?Tshzl{qt+{D^^IkQ-r$3*;X@muT+2pW zx@%*eP46qWrB7^Y7OHz#V-0PHlPnwU%7Ax;+U;3SwpCuLJfW1bhLSeyw3dxh+1Kx3 z{Z?)9JG^6ywGRHQv6nWc23j@(r9t=K2pYu}o25@bZ;+7pJxq6Qd~#$FZ6+JD=OI!^ zMQ!R1twuffTEYES8rCQ>6$IyHmW_1x{)F!1f=f@z5_6}>1rg5>eCmXXlQqo!$ z)Md*imiX?p3D>AcfbA0eE{@0@AsUQ1ywZ@QFSxk+4v>`GI zm^A`Yj%1wdj5^&lbnBCI;XPtwYCNJ1=P|y!7iWfkS>btLU|3h*HLq|;%^EFij(wJM dl!RAAOO%JjTZ=vgP0=r0%o?4vAwFYl`~}OWw(tM| literal 0 HcmV?d00001 diff --git a/.gradle/7.4/checksums/sha1-checksums.bin b/.gradle/7.4/checksums/sha1-checksums.bin new file mode 100644 index 0000000000000000000000000000000000000000..827be0272b37f26d6f497b46127b268c0f057a6d GIT binary patch literal 20387 zcmeI3do)#99LJBVJaR>$Nz$!^JW@(eDuu%Jh|zF8B2(!x4Ph!Nio{e)l1dGQ+=@c- z7_UN7nNU=kS)`|m6s553nL2E$70+*hvfN%PDAIl>1yIUgyf}9e0`3_9k;># zc$56<5Z7pxZ8`%ew|-3WrX#n;cD{RCjr(aM`Qy}4MOWp!{ZMWnP4cH2YqoNHo9E(w zHj%vjg_**gX|oGa&R_RA|1@jRN5zAoI8P;c=ew@q&ABi2P;PsG)vOh21KNIB+*GVp0BG-2<>9r8$_8KIYi;eI|H}Amr(Qziphj1RG9qXxChT7XW zl3b;pGk9@oLNl)GMRGGM<8>zPiNE3YQ6!&xtB2z~Fl8;S>qK(PzECZ{^_r(}KQ$y@ z9Nph#m2Y8-a>w-~cZzGP$1ty1!WuDdaM%C8%EUIqk3aiJ|2SjoD+0^#g z8n+C3t!Jh>tKDhu-s-c|bLLS*mCGYamZ>RG>)%le)4Zz2CFpgx-Sm;+Z8)3%OSf_g zu7%%9&w0SEr5Dt&q@sn_)t)Fa*`c`l&E^ibPDEA6(XAz%~E6UQC&aDe0li8~76Q(yR(x(swmh>!iD1U&#keqogu31x(qCDJndGP1)>k z?NC=LN-6d2ZK(J*gZDOzjavl&TY(@|>I~J+Z5Jex7pX zN#A#+u5m5l&oFfuQ3^_IDmXmEJ}aa-VvLv0%H@~*$CwI_&^tNAYaljV?~16w5xFVoUpYkUWHVBZ;~}rfzzsF6%fi4huGiN+PwDW9pU z{-|9d9O(7e@TGSnF|`Ck#gtS$vwKB?3N4slCKc5FKBH07O>fIbK5uf;Lrm$5DQSb% zY-*rRS>HYd3CLMF%fs;XSHIA`MISixjT_;%KPT%X(|(ZGxOp+f8{sGZ`m-X zcoe3Xl|&!kFn2&=gl}Wln%10kuWOAt$cwy~Z`-o@8ok>|Jg=2vNJ^90#UnwLM2*Os za>BsIweCt5w?UZDspg2E6hWw%l2)%_Q(lvmH|P1UId}bRWmj`|kkeM~HhMndT6G)(=6CO)x6g@3h}NN0|3)@-A%pW|{=@e= b!Q(BRTmLkEd&%ihGN$OKlRh{~%NXh}FD|}G literal 0 HcmV?d00001 diff --git a/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock new file mode 100644 index 0000000000000000000000000000000000000000..1b535cb7549222b3281e5afc50e7aeae4e249f5c GIT binary patch literal 17 TcmZSnu=|bT7bd}G1}FdkIhh1T literal 0 HcmV?d00001 diff --git a/.gradle/7.4/dependencies-accessors/gc.properties b/.gradle/7.4/dependencies-accessors/gc.properties new file mode 100644 index 000000000..e69de29bb diff --git a/.gradle/7.4/executionHistory/executionHistory.bin b/.gradle/7.4/executionHistory/executionHistory.bin new file mode 100644 index 0000000000000000000000000000000000000000..8a1ccf90dda0a2576c7036a0c8dc51f0102e31db GIT binary patch literal 32078 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 PCPjCoS>Gu$REz!tL+T|N literal 0 HcmV?d00001 diff --git a/.gradle/7.4/executionHistory/executionHistory.lock b/.gradle/7.4/executionHistory/executionHistory.lock new file mode 100644 index 0000000000000000000000000000000000000000..542e679f7ec569a5a8985a9c4c1123a0c7a60f16 GIT binary patch literal 17 TcmZSfpWN%Jqqazk0RjX8B$)!| literal 0 HcmV?d00001 diff --git a/.gradle/7.4/fileChanges/last-build.bin b/.gradle/7.4/fileChanges/last-build.bin new file mode 100644 index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d GIT binary patch literal 1 IcmZPo000310RR91 literal 0 HcmV?d00001 diff --git a/.gradle/7.4/fileHashes/fileHashes.bin b/.gradle/7.4/fileHashes/fileHashes.bin new file mode 100644 index 0000000000000000000000000000000000000000..5d6f16194c6300b85a2de7ec4ab75339ba182a77 GIT binary patch literal 19647 zcmeI3e^Aq99LK+7V=@~c1w@yn%MO?*BGv6+0f9SY`!cQwCNQ`$!OVp7SLsp258+hc zLbL?U0u17`1WcTuLXeVafMaAS5x?}12)UFZgktn;&-0wuzWv`__j&I2{XTndug~*5 zukUw%?fWPg#$(YuY0Sgs_OJ^*FaQR?02lxRU;qq&0WbgtzyKHk17H9QfB`T72EYIq z00Us)|6(8(Eo32HjK>N)OUHQ^!}y6&=kWq<>i$)xK5NP_>?->IL1pXB(Xoc;Zj32K zG;dgY@KmmsMul_sYnoq(J^cITCF2sDM}*S+%gb&2;WZg6NgWf-yLMks4)%REoYc|N z{F-XEleuwdn&i_oH$|&Uy3#w-a2~0p`Au0)Tc+95ALptUXx{t8!M+P4ien@{Li2%n zS?R1|{1H+|O7qb}r{&e+Gi~Jie40;&tbepDP3MdAh#NF#q)(Qw(=TR8o%d+&APbGv z51x!BbvkJ7JaCV#m{EK|@;REjh{~Mq+y7z2xw3-hzRrwy!bIv zX9vycnPKb#@MmxY17H9QfB`T72EYIq00UqE41fVJ00zJS7ytuc01SWuFaQR?02lxR zU;qq&0WbgtzyKHk17H9QfB`T72EYIq00UqE41j_E%D{7IU@3Z89^#iQD!RpUiJ3C7 zqQJZt6{h(HhT-iiR-H}7vs>7K&c6R7j($^JKj-svQfXCFK#J@hdgk9k7}_y0R?8*I ziZ9;I8&B?t4|=Akw)n3`LR`WGbA?M7dNe`9{6cZvGWMdIMxRe+<%)?Vd$>fmF4BLw zJ}jo?(u%D{-pL3np>vAIgh0(Uhf= z846)*Ok0m*Ot+JjV6*v{aJ1|mupuNa9gV}af5z<2P^)XA2KN&}hzSvTZ%brW4wp+- z`>PULcD|H9oq*<#?6TP+Oz`cwM7|SKaNh32kdda`^J#DV@R*fI84AXP@O3VsY0f#$ zD#PEryi$JPyPAHqn*fcGGDLQ1*rN)zvnpjr3WW|6zco&^=Z5#CuC@|MSxP*{f(Klp zLMl2IU*FQX#CzYFxcBn2(k|G1ea(YQ1w24 zwcp_=Z)T`+eN!gNFAdW$%ds(D9|!t7FjP6 z*)+kHWv%H%BT1;y)`P1VB4m$Z&CMuN(;iLig>BsZk+`?Lir>Mu<9k1D+~@61CH;k#A)HZa#HtlwU-eCDTxyNDAm4L4C`Zf{>}UAbI3 z$Xz&{*?n;~ga0bMcI2i@W9KgDEvpLc?@QO^H(PhF7~FJ{ySOmG(-o+^pI*uZ`q4Z` z3U^Urv975W7pK&OZ~xFfs;J~Ha?Y3|NnNwXBZf;tRjGOrcd_@Pk*9eVn%x>1(}?qT zn7NAsPPavp?rIE3ABYC{d_Q;5+nb$y=v+yA_o)wdNhm#=yVzX$Eu$^>N^wf+_*iF? rVjFkyrE`Dg1V3V%RK_=if~HjNBF#v@y8GgIO|R7;4)!eRh%NpA*ttD< literal 0 HcmV?d00001 diff --git a/.gradle/7.4/gc.properties b/.gradle/7.4/gc.properties new file mode 100644 index 000000000..e69de29bb diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000000000000000000000000000000000000..39ca530cd62d43fedea3737a5a9106e456413488 GIT binary patch literal 17 UcmZR!S+nCYQ^Wdp1_&?(05uT=bN~PV literal 0 HcmV?d00001 diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 000000000..2e9f53b87 --- /dev/null +++ b/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Tue Jun 06 10:18:46 KST 2023 +gradle.version=7.4 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin new file mode 100644 index 0000000000000000000000000000000000000000..80d25ea252ae12a367d90bde6a548ec554d437b8 GIT binary patch literal 18983 zcmeI%T}V@L7{~Gd43vDyP)wJC3MIP&5=o3OnmOj}p6)U33w@1LvGSU(Wy8&WGJi zFGSwaT{^`6k+Z+V3IY&-00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOL~?MW8``kyPbn z@=hhi7MXS-bm{UU-_hJQto5({sX`cj@c#!7zq~pd=+8)2wn+}|&I!xh6=^4+bi-}# z^S8E&3O@Jvlx{r4-P`bZ(^~konC8@QUwql`J82yMNWGo=QtpcWk>h7KbwBr&E}Pn} zzBi+ELo4_2{0H-EPxu#g6ZgorE!=DAtEBGb{;f0nZuR}T5Y4x9k5=8xa@x%0^n42U z<1N>g-oCqhf%+Qv634N=J7toa`V;P&+T^Lz{_n#y|0;LAIXLTyy3W({1Kg$ex}K5Q z@*(OP?sZR7AFQ3o&Z2&iyXnm4bJKKv6ZK{8jg6%RB}J|srAu3TeQwZtsl)e)`Z)LN ztwG(nmdR1->w7)aQToDNsHOQ%?l-(;Q>%f_4eDy{UG4=kb3p(A literal 0 HcmV?d00001 diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe new file mode 100644 index 0000000000000000000000000000000000000000..6c53d29c81ae76c79f36b29d1a813858ff4fa1ab GIT binary patch literal 8 PcmZQzVC?8izOM-Y2mS(s literal 0 HcmV?d00001 diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties new file mode 100644 index 000000000..e69de29bb 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 new file mode 100644 index 000000000..b589d56e9 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 000000000..d405dbed0 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + + \ 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 index 07115cdf1..de0c4286d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,8 @@ - - + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 7dfeef963..000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 35eb1ddfb..94a25f7f4 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 000000000..5472ab0b5 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,251 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 000000000..87827ea4e --- /dev/null +++ b/build.gradle @@ -0,0 +1,25 @@ +plugins{ + id 'java' +} + +group 'org.example' +version '1.0-SNAPSHOT' + +repositories { + mavenCentral() +} +sourceSets { + main { + java { + srcDirs = ['src'] + } + } +} +dependencies { + implementation 'org.junit.jupiter:junit-jupiter:5.9.1' + testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/build/classes/java/main/CalculatorTest.class b/build/classes/java/main/CalculatorTest.class new file mode 100644 index 0000000000000000000000000000000000000000..6827c5e0be50ebb79848260907f0d3e01695d85b GIT binary patch literal 1299 zcmZ`(OHUI~6#j0Zv>gU0=|fr!?ljrgFT z+yhlb1u7XTr+6ZsPH@Mv=ZzFa@x-lUlAB8mfmkueoMQ`fd0Zi9zlv%E7~H~KO_M`i z@Vs3ps-PBi9@MM2ga!u9vX}LhH1VT#RXB#N^Hrfwrc#FO2+K?{s64m1|0K;5v~>rg zQCY@iBGNxZ^p9&9rT2&z&4kO+`XjU-rpgAW))6nRFw~CFHX`i@$RN^32K{{sG_-oq zrlK9!7^;$7n0m2zhVo^@iJB>gn{k7r3x;CHL4-UAtLQ@anNH+YBJQcx zgdk};FOufbdATIFUKKj}7<}Do&E+o8R~_Z8{=pEQpjK|4Gxd9A4;8d+g#K-V;%gH21RtQ@kE-4%$`I(+Wee-{yy{Kjh6Yao_)KUeZ76Szn%HGr5$Z-WMA%NUTtZG zZ*J1IGoOBHhhNvT&$f>?b542pUWVrX94EAFhU#;@V^E4osJ#~mOD1zx+Kw9! zgp{)8tXjQt7^qKj4gp3t%@3_5bkjr<(ob(XJ>{7@{2gqEUR;RKDvtpV2543D1{lN; z?SNrAb>*DjQ7~yY9S(TD!RJ@P;a&LlP_>VmaG>!#)Fh$bXRKNzbZ`nPlIVbsf>%*G zKWgY|q!I0)@$5ze#?XY@XhsYzr$|m0NRH(ETo@&KV=3IgI02Bq0Rm*%oGK`l$Ud%4 zcLlERp>w9YXAeDJ2+T`RnNvz5vsRR&Ete&ncRG=xI;Sap-t?THpPq{>%W#XBNn!5f HVom-9aHKJe literal 0 HcmV?d00001 diff --git a/build/classes/java/main/Commander.class b/build/classes/java/main/Commander.class new file mode 100644 index 0000000000000000000000000000000000000000..3dd96559272dba16a0505ea7e5c7d3219005b1e2 GIT binary patch literal 3292 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 literal 0 HcmV?d00001 diff --git a/build/classes/java/main/Memorizer.class b/build/classes/java/main/Memorizer.class new file mode 100644 index 0000000000000000000000000000000000000000..4a3842eb66c684c3e5b1599f98683c1899297ea0 GIT binary patch literal 1229 zcmZWp+fEZv6kVq+OgkOgQf@*4i-=AOwu*PBfC!q96fdd4=-beql!56Cna*JF*{|@y zS6>BDf+WUgKf!M?;y%-na(S7Y?!ER}Ywxp9fBpUb1HcR(%LpMXA)=rIoeZgUeM>Kz zx>YYeTV3Z>m!Y#{ScW^x5LR<55~2*fKFD(ovsgB)4PGl7O;?75a13!M61o&5kYtE0 z^M>sh@3_Mttr5s}wi&w1?fMrU_qZm?x)r3+Lp69ra|pW0$S(SnwHBZ@N$hB3krX_6too23{oA}e7`!6l5JYQD1Fba{hNwnroAYjGNO z@wsDIZpC%D-q50$pp?7D9iBCsS8|Hc%M)h@Uphe+$j)jc zwqVx?o}|m=Prb$}cV6nNCPmU^yQ-Tjx?_mnK``P{+YIqKcbBZDt6Nn0<>noW$18?1}8?gL_8H&uWl^sn}JxgR5gQjlq&$npZLt^DAa+@NL5T+B5%I|~a4cdCtpyvR}Wy{RHp~&ov|%Mw_1dskG_%?Vj&Mop8SXv6}&d z%8^8h>>I0LGmKk9aHasJIWhv6+^*IdwuoHf;IeePVeN>(Wsa-}C@-r`;a}m%W0XOg zZ@#b^TSPzcb|}A&aZG3!<+zGTYSH#Pfy*#fG^~B+&?)&&uve<@?z`>C)KS1S4bvPm zxK2IK09!%tfSMgTe$TDHXDAm3syBV7+cgIQb`*NSo;lb-5J>)6j+>ZcNL9SRi`HrG zL8`d2YBbYG>a^!<8ksbB8d>2P9E(^ITgyqh43kA;_}jiFa$$XlJZ<2Rkq6SXmc8aM~UlfSq-y?XS)qX9Fvw--23FC?5&G@A6< zm9`)6zA#WIE>s!XeBETw?M^RjyRSSkclJzc%i@iQv*vcA*PU*pp+fopgvP+DLEwh+ zpF(kShqS2_)t3Vu|YRkvB(HeDpqYUom!y z@z3NjEYojF=IHH6Nu?OShJ=jjdA4|hsZ%h4Pn^TAP=x00q@t+b9XrGr7Oj;t_ndp~d41>Ho1dTm z@C3jJihj7@)}ZK6;Sp%RZrn2Bd84=#pIW$XW^Dn_uvN6|Q2}=(I_HBIJ`H{yo1hB> z<}CB0_?VH;*7Am3stEYAO+rVyMW58LnO07anr-FdGq#bv;YS3~-6dYTnc_i2cmB zY??O&wnU<@nrk>9(6Qk)RkY0|v*Je_hjbj4IeV?5J!j-=ru6xij)e5-E|QCx8B}MmmYEFh3*KrzW7^ZAgswU&N z)LF+V8BNLXXLY3Tu7GA$PZ!GeZ3nYU(oI@N29wm>lBrHz69`38%>_3qOG-D>I?mxe ziA=4U6X<^(uCHR{XEAOX)tePaTSarSR#-4A=Z%Ft+t-;caqi}fiY4X7refzTwr8WDTtc>N2YSpCZ=AFV$0`KBW;f7ycEOLH1 zQqIa3fU811pAHC|rxfQZxT*sWA-*Hy!Ysd14Rm6TU%h?+^NzU>7jTg~(m3pB=yC?dSsZpB>8ibwv*10J|*2*L5RuTM^|`o4Y8jPU&FzxBXrUvFOE=m zWWHY1GS2)jo1+9`8J#N_S_S?3R&c^$<|P)7FqTm1{GEGf9}KFGFtLWI`DF}kB$Mzo zf{)Mz^BfF%f@IwsJnYIa1ru&hGaTr(Nj7 z_Z+()$^C*o_!WEc8}{LM_UKRc>@UQGz@XU7r?3lg(Zg3XjKg9Vj)=WTh!~EE{TLBP zF)BuJTuk7kn8zt`1!Ka*xTx{L`xs&I8Pei&WW<-465p~nax%|Cmu4;5@o$zd)@EesLdJEVAQrmgJn*cdl_~i8}`odQN8=+QdH? z*U&2hfq>rEt+(;d`xL6{88dr^sCWwfZ>ZfmZ(r`k-P+9%^0(s!-d3JUPF^c~Lmg`!CK!p|=14 literal 0 HcmV?d00001 diff --git a/build/classes/java/main/main/Calculator$Ops.class b/build/classes/java/main/main/Calculator$Ops.class new file mode 100644 index 0000000000000000000000000000000000000000..8c7bd8e483b273c62fd0f9d2006b70427e4a44f1 GIT binary patch literal 1152 zcmZuxZBNrs6n^g7ty?W_ju&BqBBHFI43zoS2{VXsNdc3xC5xXfvtmitnXcn^=}3fV zG<^0)8PC1eFl1Y@lXK2P??_yVgL!i9#&0)uWFd4VZDfgMdf9kZ?-TY|v|0 zT7JCy!a$+8P-STIb&ElFI=!&vzV^i2*>kNei#H<99k(03>2xCv70Ul7GzOy<1a2rF z%B7(cQfPIB4q6}?C#zFJrvO=!p|m7EX-RWHt{}7~kd(iVC8~Qs-W*x+(fi1K#n>6f zKaOus3aqqid^m16uF5;Cgi+2Sdt&cFmdaRI+V5#uikt9U5$Bo{)7j;m1U3uuc= z(rlypW;Q9MRYOn>oMYCP=|Jf&O$ U&+uGYi~eco%!FpJuwE_v0SvX^!2kdN literal 0 HcmV?d00001 diff --git a/build/classes/java/main/main/Calculator.class b/build/classes/java/main/main/Calculator.class new file mode 100644 index 0000000000000000000000000000000000000000..ed3d3b4250380aa70ff612b80cceb44afdf88dc5 GIT binary patch literal 2045 zcmb7FOK%fb6#lL~<8jOcI|(*P2$V+>?6|?aYA8;^BZ1<^PM{_UueMB_A(>#0jXg$U zTeVVGNR_%_*LFdqs;X$H0xBx%x>El@H(gcjwo57+^}Az3jA7AQIdjjs=bqPh&b|40 z{f8$2Mqvlwfmef~LxoQuv~1im5(UFvOia%&n|VjTH)7eAGbZ4T#%9~#N1KL#j!n=7 zf|+sUi@_Hwhh?7JW*?W?H#HYK~P%gbl{o^#m%da+GIpN{R=@ls_ur()TQ0{$hVx-?!| zFx}eHe(V$wacQ?(#~$>vcJpS8Y8V+)3#ekvmFuCUZfeF{b0Vi$-=r>QCx8B}MN_3qOG!89bezX~ z5}8_cNnr4GxW0;2fW>%eRBu)=W7+0ZtvGL1E*SF#wy!f&;@r&|6-&yEO~qNV*t$)N zrjxd-j$!9{vWu-~8LgB++w-aAiAeNHQvxqAV7*SM%m$|=SCpK^n)9V%(Xbcj_%&7> zpo&?o6$q@S%1=k#@y6scbmZmKZ2|N zW2z_V>rvOx^EKV_XOf0U3DQ|olqC0#Hr9(hYUdkk*mW04Z_>Ad{gek>c~Ft^PRe^- zIigBAL^N#bd0~{g z!*lhbR&eHj*&HDdE9hLsu?L{vwpE;PnK_BYBaA0iI)CRbLc?M85hm9#J-32m8_6Vn zjo_nn!90h(F&Fc{Q#bnET>^FM{^dB)71Ats(e{~Kzz&fB;2;%@C>2>ILe7=Dg??g2D;!F zNm;al;8PN1lZq|a%CTMK>=IbF1ixZ84{?vq zNc+m@UH+)dv?jaT#=?Z&s-g`E!ps_3J8wQGAxDQ@BSw~HNJIxZ6?CacuGqM|Oh|>a zeNLLUTg4vi6$nZ5hE2;5Sl`;_F;{tZ2oDR0cm$8&s|voRVn4c9d&k8n5G>>}Ci!To zX26;I6-#gQs(2KSQC3eI`jo(i)+!s@PKR(nAaTkrwoDswXC`M%#LwkzYcigtubP|V z$1;XiFyeWmQ!X|)OST47JdT3`5napZ#f;|Iq-(85*TC`=`5M9@1t}GW@r1w{FD91P z$@Y>w391e+6=NEVs5pY70vog1lrdmiy5^iPoiuv|N3)!QbZn{$y)g(pDP^Ck&RjJa z>Eq)nzAnQlP|&6g1t$dJD;ecx#)w(SYL1>hcwRShj%iy8P6=#tcexHeQp}DU`9V9+ zZOfZvXq-{;4H-N^J!2OP>8EE@d=uYdn3{#h%}MFys$oh;jWbxg|l`qg9%Ytl)}sb^K>K}|J!TFW0GhyW=a z2%$(X?e2=-dH=>|v#*74j>A1&@qgaBc;|&1GW%v^>eYns9WLCtIQQ9wcjNmR(A)7n z72lU62HotFhW=2+^U`!>(kK^#4qQ-i5ibhVaxUe%Q)ev1m@N0@-VlByH~*MvzO-Bs zYXm%CPf&J^%r}qzd`aht0ppP7xTI? zXi9$Tm)Yx*e38_C+ja_0UdxRbPTHO*tf|58BKST2px~;^$7=#RSEx0uX?w~@dJKE% zJ*erdDKi3ZRTjMRMo;M>UMv}-uyfe9r;54m3Z}}gs+d_Nc${Ud%Jxc6E@jaDDj0E@ zQPVNHL--?O!SgL6UW9Oyu`c4haUr0lE zWHd9Ud@PSXUYoqU*o(-r%vNFH<8y)EmpMwZ6>Niv+YmR|@!=JI<+A*~%CG8ez-xG& zqp-|V&QMtV3x4*2zkUMc)B?h{vF3?I#1bWJ>}jl-L;V68W7|q-p2tjMU=Hd6T1sf2 zN4haMhcWJZ=!E=?bi}?=!oDM&i|CofIw{phDR+JT-i-zHca|`?FTjO{z{eN{xY{AR z$AJAoYTXXU%fWM&M^~F;Nadi+s!5hRp z#MPftkDvOt;Z6Ju0iF=T&$${T)(iLr=L9v^@uXj|cirv1#a=D`%#&wn-8=m4LgcP| z1S)s2QPh2j4h4@WxcoU1UqJQsD;PVb;A9=W&u4?@ef*sW{FHst-`kY<^a>6qn)VDg z1#`1d+ZXZlEcW`Zw#T#*^jU0ek4?IrhW420cGULR6gzK23CttlpGDAr^`cMA-zx>K zQmIG(E*=P)8=|Qy4k3mVi9d`+5QWP@jEVso`vw8}FoIvxc%KAFx-PMm zhHioKB`3u_I+0K3%e0e`zQf-q0-uw!u)J=|_PtrQFX8WLWRzsDFd`dE$n`cwADVav zs%)a+4_)Ab!2eMJ`~f#FPBQ6EF?vojLe4NkPBJ2%UIrVbIqzYPr})Uf1WP1LRcU|+ zHj2Pq_{3do5nq7+g4D+sbQ#|e<>a4jGM*h~glwn1wuJL?^jrzwl}Rn!VBSClfJQdQ z2}-A`32fzKA&mENrL1(1yBi2B;s-0`K>kMqNRwf+q9g?Hfy-+MA1;GxbBzG%7V*L@ vv@GJKTj*bb;3*1odo7iHM5R9b2J>v|+50Vpue;wHSm0cQ<6Df=+t~acl7|)F literal 0 HcmV?d00001 diff --git a/build/classes/java/main/main/Memorizer.class b/build/classes/java/main/main/Memorizer.class new file mode 100644 index 0000000000000000000000000000000000000000..a5bea138e6f943872fd831612d400915dcb5d41d GIT binary patch literal 1244 zcmZWpOHuYe*XdBJ|3$GA*>*xp$+WFh{CCgbemr7R6SD_#rLkBbkof_ik5{Op~ z%gN81RoAoLnVx{M!b;cM6zDD;fxM`jb+aIQyEP=yBM_?|^(0CsQ3@UCL%)In4QFsx zpsNLlLXD**fj+%Kacr1E=8bGlX&Ayefk=(2g1P2mxPY{RVGS2Ca>9o4X3aONta9r# zqpyK!x%uaw<@jaaGmUB?iZQ1A71J}*RxRzg>E@idoQliP6=XDIF)q*(h&|a(Th=9* z?X-v{y5%evG7D1l6%9G$DSF+tZJvRiIX#|&YbUh_04j|Q)6=rG>==ICCL|ShN{QmfVVAFBqOBznj5`&#?tMmQ8=osriOek(CtM za)8o#V}rSN&#cvL+L}B~FN;>(w*qaxRW%7K<^(#+zEN45H`bes(PG7J-cGgb*1d}P z#FFyjhj%U~4aYDo2=T&)pvnstyzz!Y;Ck?WgSS5RWuqSplL(pb@7NxA~Onrd1 zjq}OTZ@9FT`Ut&|nh^MjtMklEF!5d-$nZo%!>5DaQbsrso}&P8`&10lh!py{PXpYb z6w=UXcAi@_i4jT}#Y2n*Qq%0!DO(DZLrgbCtIR%Nm0$$?hlKuMKx2cjm86%#exxVn@HUeeCsbc%6nSQuqt zq7WCjaAD%Y1w=(+3_rl1LQDJy#_vum6~V>ax%b@jz0Nn^{P^{455Of{Q{X{`50xss zsA32%@fEJ8xw)v{nO`ze4nx(nFokoOp&}ef`r&727}KI!OzYFeM>Sm=iD?7cL;wn^ zeNa`@pq8O_mZwv>Gx3U?85$?(7?b=FBE*J>Fg&C{Lx&HY zD!Oo<7EPm<=rak*q}gDP|kF$7YjhENjC;S~Kdori)H4JOLv%3e<~)EovYHvjb9oau;+krY`$_A{nwIlR=LuEfbbye_C( z{$!444D#q*;prSDa_7+V!TN{7vp4zYueJQ!)xyT-!mF+Q-L3q)P3>T9t?*(y|8i3+ zeRDImoqzvb+yAs$c)E44?iv-%2N~M_6Tei7@+Y8WGt?jJ9fML1LhU_4Sfbpsa(2qN zDWsGQN7WjX!$5tKa|kecXnts|pob=skYU>C^pmS&`z()d$3e>tnX+-NlH9FlW(W23z67{a6^mWsFn*MnnVpdUJS6p4L Iy1r(91Lj9DQUCw| literal 0 HcmV?d00001 diff --git a/build/classes/java/test/CommanderTest.class b/build/classes/java/test/CommanderTest.class new file mode 100644 index 0000000000000000000000000000000000000000..d986960b5fa141ccb7df18fb0b277170f240d634 GIT binary patch literal 1635 zcmZ`(-%}e^6#i}qB&6G>Y%MJ<;9<=!2mC%YdhSLk`BQ=^-jk)O5?1GlaGPK>$4Ly5{p(WHerp=tj;0-+xJUSUzuYfu)p-bSLaGb`~WJdGj zBK_|7<7I}{LFKA4)Q(r6_;5+WW%M$fJm5R6Wr(RS;qYgWk5l&JRYFq&xQ37qeG_FBsPiZ8Ddd)y!#iHc2~jJe^RJGpebJwY%xf z&g+yZ7(ddd7C5IrN}{`ScMv6tED9+F|V4|&t=!KPpLgwwN`d& zg>`FXYk;Bqf65U;P#x`dHyu^}vF8nyD79jNuWazORmIxgtnNLDC@w>Vua)?6iMSr$ z5X7j;YAMePj}>dV$ctMfj$M&cpS7_sSo5u~tEI;_x~+x?to~W%n|a5b|6y!-I?~Hho|s zEO$RcPdHpgk9_4hu0BJgrGnRK9jV|gnpN;_SiaTh<8Ab*GwgwnQgu?QbM!8s#}#^2 b!?=L!xQKh`KE!sSIor6+mf<6U@nG^l$|n7B literal 0 HcmV?d00001 diff --git a/build/classes/java/test/test.iml b/build/classes/java/test/test.iml new file mode 100644 index 000000000..7f4fe5fa8 --- /dev/null +++ b/build/classes/java/test/test.iml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin new file mode 100644 index 0000000000000000000000000000000000000000..8f0b619520bf1516fd9c7bd11f0f3f2fcc0657c5 GIT binary patch literal 1351 zcmah|eM}o=9R6LerL~lD(5^C&u3$$+##`n<%EuUZe8`}KjgImmn@4*P!vJWQ2In*p6iV@@H2TBa_T4YMZ_$K$}clW%{ zb5DN1=ZydoLjve=QZ^S3-9qT292T#G;ux0jrpD3A2sW{I?)0ZkD{P9$6aoF@eOwHF z+QSjG@A=MDl$UZ>((_)KK0UWAF+Bi%B;#~aE-TH73BMeIlY-;B<|n!*9rhW8l*A$- zxP}vXZ~lJioYI=q6`gmrqN3q@Syhx4a5)@tdx&6f#>sml=TFx7a#c42=DKJjMnI5u zGOXig)_&IB!IadTxz27!QhLOtDCTlxP!DfuCVpAB3ZJugk{8LBQ^H+c=ut z41UUO!^Ic~L=uSKlTaM{5cJwSZU@zw$YV}=6#)zvNo4?143hxJFbn|HMX_6;&*Pz4 z&c?VrSV#e)F-*#1KK{ACd}~#-1}T%E*G;jM(?h(PnY(cDxf9kSq3IbJyq3}Rx?=X!AMMk>rffy36zFH%w2R}LooOc~hEv~Kc_~RY z)|E8io4+=tD}SUqwdhfljPr|Fh^;FbXdnCO%OAEI@DE1Y(`vS9b$B`)xvhTbxM8WV_^Yg%$4%MDfD}0pZ1K7*p|;|=5NKnW z4x6hr4+37d+hOA;eLJcI4qYDqW{12!Zu*PG@%)nPozV9zZSitcvx6oUXB+3{MG0xt z^MwO1XbkVGiHNowLtJ*Yz5A2zj>V4& z^iwVu!?!79q7(vrx5LtxhdOTeG$bw@sP5k^eUI(3SbG0xUrbVOU!-vArP5vosV^=br^^X;!#Xiz8canz;vL5k&XE4tge$lJWUM>xcI-ce|gOcQ}e@n0l&vU z5lsBI%-T%QUlUnp1AL(yC@Divn##%D`U>a?T?bq!u7n;t)lTssCNiQuWR+fkM^=Vj zrPXM!v5E-S(fd#hY0~cpzlXKp!q7KCEonykabaCmy|xyYH=st+v`T!6G)Fd}17y|e fIglMhPn#%mcO?HaURTnLEJo9+uGMHJLdM`v{RFmw literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..41d9927a4d4fb3f96a785543079b8df6723c946b GIT binary patch literal 59821 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 literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..41dfb8790 --- /dev/null +++ b/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/gradlew b/gradlew new file mode 100755 index 000000000..1b6c78733 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..ac1b06f93 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/src/Commander.java b/src/main/java/Commander.java similarity index 96% rename from src/src/Commander.java rename to src/main/java/Commander.java index 82eb7cb38..58fe49f38 100644 --- a/src/src/Commander.java +++ b/src/main/java/Commander.java @@ -1,4 +1,5 @@ -import java.io.IOException; +import View.Calculator; + import java.util.InputMismatchException; import java.util.Scanner; @@ -10,9 +11,11 @@ public class Commander { private static Calculator calculator = Calculator.getInstance(); + // TODO : 메서드명 수정 public static void getMenu() { Scanner scanner = new Scanner(System.in); try { + // TODO : 메뉴가 늘어나면 if 계속추가해야된다. while(true) { printMenu(); int menu = scanner.nextInt(); diff --git a/src/src/Memorizer.java b/src/main/java/Memorizer.java similarity index 100% rename from src/src/Memorizer.java rename to src/main/java/Memorizer.java diff --git a/src/src/Calculator.java b/src/main/java/View/Calculator.java similarity index 95% rename from src/src/Calculator.java rename to src/main/java/View/Calculator.java index 2c81e9fa9..90cd97d80 100644 --- a/src/src/Calculator.java +++ b/src/main/java/View/Calculator.java @@ -1,3 +1,5 @@ +package View; + import java.util.Stack; public class Calculator { @@ -5,10 +7,10 @@ public class Calculator { // for operation enum. private enum Ops { PLUS, MINUS, MULT, DIV } - // for Plus / Minus Operation. + // for Plus / Minus Operation history. private static Ops PM; - // for Multiply / Divide Operation. + // for Multiply / Divide Operation history. private static Ops MD; private static Calculator calculator = new Calculator(); diff --git a/src/main/java/View/InputView.java b/src/main/java/View/InputView.java new file mode 100644 index 000000000..a23d29a0c --- /dev/null +++ b/src/main/java/View/InputView.java @@ -0,0 +1,5 @@ +package View; + +public class InputView { + +} diff --git a/src/test/CalculatorTest.java b/src/test/CalculatorTest.java index 001ae29f8..34700340b 100644 --- a/src/test/CalculatorTest.java +++ b/src/test/CalculatorTest.java @@ -1,7 +1,8 @@ +import View.Calculator; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -//import Calculator; -import static org.junit.jupiter.api.Assertions.*; + +import static org.junit.jupiter.api.Assertions.assertEquals; class CalculatorTest { @@ -10,8 +11,6 @@ class CalculatorTest { @DisplayName("calculate함수는 띄어쓰기로 파싱된 commandArr를 계산하는 함수.") @Test void calculateTest() { - // case 테스트마다 commandArr, result 갱신해주는거 불편하다. - // 매크로로 못 선언하나 ? // 1. * + / - command = "5 * 2 + 64 / 32 - 7"; assertEquals(5, input(command)); @@ -34,4 +33,4 @@ int input(String command) { String[] commandArr = command.split(" "); return calculator.calculate(commandArr); } -} \ No newline at end of file +} From ef32ad9d2b18dc05e3574aeddb8a51a876de5594 Mon Sep 17 00:00:00 2001 From: BeommoKoo Date: Tue, 6 Jun 2023 15:40:08 +0900 Subject: [PATCH 06/16] gitignore test --- .gitignore | 203 +++++++++++++++++++++++ .idea/workspace.xml | 17 +- src/main/java/{View => }/Calculator.java | 2 - src/main/java/Commander.java | 90 +--------- src/main/java/{ => Model}/Memorizer.java | 16 +- src/main/java/Number.java | 2 + src/main/java/Operator.java | 3 + src/main/java/View/InputView.java | 103 ++++++++++++ src/main/java/View/OutputView.java | 32 ++++ src/test/CalculatorTest.java | 1 - 10 files changed, 353 insertions(+), 116 deletions(-) create mode 100644 .gitignore rename src/main/java/{View => }/Calculator.java (99%) rename src/main/java/{ => Model}/Memorizer.java (53%) create mode 100644 src/main/java/Number.java create mode 100644 src/main/java/Operator.java create mode 100644 src/main/java/View/OutputView.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..a63365857 --- /dev/null +++ b/.gitignore @@ -0,0 +1,203 @@ +# Created by https://www.toptal.com/developers/gitignore/api/java,macos,intellij,gradle +# Edit at https://www.toptal.com/developers/gitignore?templates=java,macos,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* + +### macOS ### +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +### macOS Patch ### +# iCloud generated files +*.icloud + +### 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,macos,intellij,gradle diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 5472ab0b5..9560ebf55 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,14 +5,11 @@ - - - - - - - - + + + + + @@ -220,7 +217,7 @@ - + diff --git a/src/main/java/View/Calculator.java b/src/main/java/Calculator.java similarity index 99% rename from src/main/java/View/Calculator.java rename to src/main/java/Calculator.java index 90cd97d80..7bf4517a7 100644 --- a/src/main/java/View/Calculator.java +++ b/src/main/java/Calculator.java @@ -1,5 +1,3 @@ -package View; - import java.util.Stack; public class Calculator { diff --git a/src/main/java/Commander.java b/src/main/java/Commander.java index 58fe49f38..6090d9029 100644 --- a/src/main/java/Commander.java +++ b/src/main/java/Commander.java @@ -1,7 +1,4 @@ -import View.Calculator; - -import java.util.InputMismatchException; -import java.util.Scanner; +import Model.Memorizer; public class Commander { @@ -11,94 +8,9 @@ public class Commander { private static Calculator calculator = Calculator.getInstance(); - // TODO : 메서드명 수정 - public static void getMenu() { - Scanner scanner = new Scanner(System.in); - try { - // TODO : 메뉴가 늘어나면 if 계속추가해야된다. - while(true) { - printMenu(); - int menu = scanner.nextInt(); - - if(menu == 3) { - System.out.println("Exit"); - break; - } - // 조회 - else if(menu == 1) { - memorizer.show(); - } - // 계산 - else if(menu == 2) { - // scanner buffer 비우기 위함. - scanner.nextLine(); - String command = scanner.nextLine(); - String[] commandArr = command.split(" "); - // commandArr check - if(!check(commandArr)) { - System.out.println("You've typed wrong menu!! Please re-type!!"); - scanner.nextLine(); - continue; - } - int result = calculator.calculate(commandArr); - System.out.println("result : " + result); - String resultStr = command + " = " + result; - memorizer.save(resultStr); - } - - else { - System.out.println("You've typed wrong menu!! Please re-type!!"); - scanner.nextLine(); - } - } - } - // Problem : - // 선택 : 2 + 3 / 2같은, nextint()를 이미 받아버리면 - // 정상작동한다. - catch (InputMismatchException e) { - System.out.println("You've typed wrong menu!! Please re-type!!"); - scanner.nextLine(); - } catch (NumberFormatException e) { - System.out.println("You've typed wrong menu!! Please re-type!!"); - scanner.nextLine(); - } - scanner.close(); - } - - public static boolean check(String[] command) { - String s; - for(int i = 0; i < command.length; i++) { - s = command[i]; - if(i % 2 == 0) { - if(!isDigit(s)) { - return false; - } - } - else { - if( (s.equals("+") || s.equals("-") || s.equals("*") || s.equals("/") ) == false ) - return false; - } - } - return true; - } - // ASCII값으로 판정. - public static boolean isDigit(String s) { - for(int i = 0; i < s.length(); i++) { - char c = s.charAt(i); - if((int)c - '0' < 0 || (int)c - '0' > 9) - return false; - } - return true; - } - private static void printMenu() { - System.out.println("1. 조회"); - System.out.println("2. 계산"); - System.out.println(); - System.out.print("선택 : "); - } public static void main(String[] args) { getMenu(); diff --git a/src/main/java/Memorizer.java b/src/main/java/Model/Memorizer.java similarity index 53% rename from src/main/java/Memorizer.java rename to src/main/java/Model/Memorizer.java index 01351c246..47dac5df4 100644 --- a/src/main/java/Memorizer.java +++ b/src/main/java/Model/Memorizer.java @@ -1,3 +1,5 @@ +package Model; + import java.util.LinkedList; import java.util.Queue; @@ -18,19 +20,5 @@ public void save(String result) { history.add(result); } - public void show() { - int times = history.size(); - - if(times == 0) { - System.out.println("there is no history.."); - return; - } - while(times > 0) { - String result = history.poll(); - System.out.println(result); - times--; - history.add(result); - } - } } diff --git a/src/main/java/Number.java b/src/main/java/Number.java new file mode 100644 index 000000000..5c4d46a4c --- /dev/null +++ b/src/main/java/Number.java @@ -0,0 +1,2 @@ +public class Number { +} diff --git a/src/main/java/Operator.java b/src/main/java/Operator.java new file mode 100644 index 000000000..958be1270 --- /dev/null +++ b/src/main/java/Operator.java @@ -0,0 +1,3 @@ +public enum Operator { + +} diff --git a/src/main/java/View/InputView.java b/src/main/java/View/InputView.java index a23d29a0c..bdc7bb7d2 100644 --- a/src/main/java/View/InputView.java +++ b/src/main/java/View/InputView.java @@ -1,5 +1,108 @@ package View; +import java.util.InputMismatchException; +import java.util.Scanner; + public class InputView { + Scanner scanner = new Scanner(System.in); + private static final String ERROR_MESSAGE = "Unavailable Input !! Please re-type!!"; + + public static final int SHOWMENU = 1; + public static final int CALCULATEMENU = 2; + public static final int EXITMENU = 3; + + // TODO : 메서드명 수정 + public void getMenuInput() { + try { + while(true) { + // TODO : 메뉴가 늘어나면 if 계속추가해야된다. + int menu = scanner.nextInt(); + + if(menu == EXITMENU) { + System.out.println("Exit"); + break; + } + // 조회 + else if(menu == SHOWMENU) { + OutputView.showHistory(); + } + // 계산 + else if(menu == CALCULATEMENU) { + // scanner buffer 비우기 위함. + // TODO : 입력받는건 또 다른 메소드로 빼자. + // TODO : 리턴값만 받아서 save. + String[] commandArr = getCommandInput(); + if(commandArr.equals(null)) { + System.out.println(ERROR_MESSAGE); + continue; + } + // commandArr check + int result = calculator.calculate(commandArr); + System.out.println("result : " + result); + String resultStr = command + " = " + result; + memorizer.save(resultStr); + } + + else { + System.out.println("You've typed wrong menu!! Please re-type!!"); + scanner.nextLine(); + } + } + } + // Problem : + // 선택 : 2 + 3 / 2같은, nextint()를 이미 받아버리면 + // 정상작동한다. + catch (InputMismatchException e) { + System.out.println("You've typed wrong menu!! Please re-type!!"); + scanner.nextLine(); + } catch (NumberFormatException e) { + System.out.println("You've typed wrong menu!! Please re-type!!"); + scanner.nextLine(); + } + scanner.close(); + } + + private String[] getCommandInput() { + String command = scanner.nextLine(); + + String[] commandArr = command.split(" "); + + if(isValidCommand(commandArr)) + return commandArr; + + return null; + } + private boolean isValidCommand(String[] commandArr) { + String commandEntity; + for(int i = 0; i < commandArr.length; i++) { + commandEntity = commandArr[i]; + if(i % 2 == 0) { + if() + return false; + } + else { + if() + } + } + } + private static boolean check(String[] command) { + String s; + for(int i = 0; i < command.length; i++) { + s = command[i]; + if(i % 2 == 0) { + if(!isDigit(s)) { + return false; + } + } + else { + if( (s.equals("+") || s.equals("-") || s.equals("*") || s.equals("/") ) == false ) + return false; + } + } + + return true; + } + + } diff --git a/src/main/java/View/OutputView.java b/src/main/java/View/OutputView.java new file mode 100644 index 000000000..c657607d3 --- /dev/null +++ b/src/main/java/View/OutputView.java @@ -0,0 +1,32 @@ +package View; + + +import Model.Memorizer; + +public class OutputView { + + Memorizer memorizer = Memorizer.getInstance(); + + public static void showHistory() { + int times = history.size(); + + if(times == 0) { + System.out.println("there is no history.."); + return; + } + + while(times > 0) { + String result = history.poll(); + System.out.println(result); + times--; + history.add(result); + } + } + + public static void printMenu() { + System.out.println("1. 조회"); + System.out.println("2. 계산"); + System.out.println(); + System.out.print("선택 : "); + } +} diff --git a/src/test/CalculatorTest.java b/src/test/CalculatorTest.java index 34700340b..079c38ece 100644 --- a/src/test/CalculatorTest.java +++ b/src/test/CalculatorTest.java @@ -1,4 +1,3 @@ -import View.Calculator; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; From 73e958bec87b5b795b1dbd3c0305e22d9fca701e Mon Sep 17 00:00:00 2001 From: BeommoKoo Date: Tue, 6 Jun 2023 15:42:52 +0900 Subject: [PATCH 07/16] Applied gitignore --- .gradle/7.4/checksums/checksums.lock | Bin 17 -> 0 bytes .gradle/7.4/checksums/md5-checksums.bin | Bin 19347 -> 0 bytes .gradle/7.4/checksums/sha1-checksums.bin | Bin 20387 -> 0 bytes .../dependencies-accessors.lock | Bin 17 -> 0 bytes .../7.4/dependencies-accessors/gc.properties | 0 .../7.4/executionHistory/executionHistory.bin | Bin 32078 -> 0 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 0 bytes .gradle/7.4/fileChanges/last-build.bin | Bin 1 -> 0 bytes .gradle/7.4/fileHashes/fileHashes.bin | Bin 19647 -> 0 bytes .gradle/7.4/fileHashes/fileHashes.lock | Bin 17 -> 0 bytes .../7.4/fileHashes/resourceHashesCache.bin | Bin 18973 -> 0 bytes .gradle/7.4/gc.properties | 0 .../buildOutputCleanup.lock | Bin 17 -> 0 bytes .gradle/buildOutputCleanup/cache.properties | 2 - .gradle/buildOutputCleanup/outputFiles.bin | Bin 18983 -> 0 bytes .gradle/file-system.probe | Bin 8 -> 0 bytes .gradle/vcs-1/gc.properties | 0 .idea/gradle.xml | 18 -- .idea/uiDesigner.xml | 124 --------- .idea/workspace.xml | 248 ------------------ build/classes/java/main/CalculatorTest.class | Bin 1299 -> 0 bytes build/classes/java/main/Commander.class | Bin 3292 -> 0 bytes build/classes/java/main/CommanderTest.class | Bin 1640 -> 0 bytes build/classes/java/main/Memorizer.class | Bin 1229 -> 0 bytes .../java/main/View/Calculator$Ops.class | Bin 1152 -> 0 bytes build/classes/java/main/View/Calculator.class | Bin 2045 -> 0 bytes .../java/main/main/Calculator$Ops.class | Bin 1152 -> 0 bytes build/classes/java/main/main/Calculator.class | Bin 2045 -> 0 bytes build/classes/java/main/main/Commander.class | Bin 3317 -> 0 bytes build/classes/java/main/main/Memorizer.class | Bin 1244 -> 0 bytes build/classes/java/test/CalculatorTest.class | Bin 1298 -> 0 bytes build/classes/java/test/CommanderTest.class | Bin 1635 -> 0 bytes build/classes/java/test/test.iml | 28 -- .../compileJava/previous-compilation-data.bin | Bin 1351 -> 0 bytes .../java-calculator/.idea/.gitignore | 8 - out/production/java-calculator/.idea/misc.xml | 6 - .../java-calculator/.idea/modules.xml | 10 - .../java-calculator/.idea/uiDesigner.xml | 124 --------- out/production/java-calculator/.idea/vcs.xml | 6 - out/production/java-calculator/README.md | 69 ----- .../java-calculator/java-calculator.iml | 11 - out/production/src/Calculator$Ops.class | Bin 1117 -> 0 bytes out/production/src/Calculator.class | Bin 2020 -> 0 bytes out/production/src/Commander.class | Bin 3277 -> 0 bytes out/production/src/Memorizer.class | Bin 1229 -> 0 bytes out/production/src/src.iml | 12 - out/test/test/CalculatorTest.class | Bin 1312 -> 0 bytes out/test/test/CommanderTest.class | Bin 1635 -> 0 bytes out/test/test/test.iml | 28 -- 49 files changed, 694 deletions(-) delete mode 100644 .gradle/7.4/checksums/checksums.lock delete mode 100644 .gradle/7.4/checksums/md5-checksums.bin delete mode 100644 .gradle/7.4/checksums/sha1-checksums.bin delete mode 100644 .gradle/7.4/dependencies-accessors/dependencies-accessors.lock delete mode 100644 .gradle/7.4/dependencies-accessors/gc.properties delete mode 100644 .gradle/7.4/executionHistory/executionHistory.bin delete mode 100644 .gradle/7.4/executionHistory/executionHistory.lock delete mode 100644 .gradle/7.4/fileChanges/last-build.bin delete mode 100644 .gradle/7.4/fileHashes/fileHashes.bin delete mode 100644 .gradle/7.4/fileHashes/fileHashes.lock delete mode 100644 .gradle/7.4/fileHashes/resourceHashesCache.bin delete mode 100644 .gradle/7.4/gc.properties delete mode 100644 .gradle/buildOutputCleanup/buildOutputCleanup.lock delete mode 100644 .gradle/buildOutputCleanup/cache.properties delete mode 100644 .gradle/buildOutputCleanup/outputFiles.bin delete mode 100644 .gradle/file-system.probe delete mode 100644 .gradle/vcs-1/gc.properties delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/uiDesigner.xml delete mode 100644 .idea/workspace.xml delete mode 100644 build/classes/java/main/CalculatorTest.class delete mode 100644 build/classes/java/main/Commander.class delete mode 100644 build/classes/java/main/CommanderTest.class delete mode 100644 build/classes/java/main/Memorizer.class delete mode 100644 build/classes/java/main/View/Calculator$Ops.class delete mode 100644 build/classes/java/main/View/Calculator.class delete mode 100644 build/classes/java/main/main/Calculator$Ops.class delete mode 100644 build/classes/java/main/main/Calculator.class delete mode 100644 build/classes/java/main/main/Commander.class delete mode 100644 build/classes/java/main/main/Memorizer.class delete mode 100644 build/classes/java/test/CalculatorTest.class delete mode 100644 build/classes/java/test/CommanderTest.class delete mode 100644 build/classes/java/test/test.iml delete mode 100644 build/tmp/compileJava/previous-compilation-data.bin delete mode 100644 out/production/java-calculator/.idea/.gitignore delete mode 100644 out/production/java-calculator/.idea/misc.xml delete mode 100644 out/production/java-calculator/.idea/modules.xml delete mode 100644 out/production/java-calculator/.idea/uiDesigner.xml delete mode 100644 out/production/java-calculator/.idea/vcs.xml delete mode 100644 out/production/java-calculator/README.md delete mode 100644 out/production/java-calculator/java-calculator.iml delete mode 100644 out/production/src/Calculator$Ops.class delete mode 100644 out/production/src/Calculator.class delete mode 100644 out/production/src/Commander.class delete mode 100644 out/production/src/Memorizer.class delete mode 100644 out/production/src/src.iml delete mode 100644 out/test/test/CalculatorTest.class delete mode 100644 out/test/test/CommanderTest.class delete mode 100644 out/test/test/test.iml diff --git a/.gradle/7.4/checksums/checksums.lock b/.gradle/7.4/checksums/checksums.lock deleted file mode 100644 index e3ca360a53ce048509ae3e911fc677bb3abf926d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 UcmZQBas2Hyb;=f21_-bL05O;Z8~^|S diff --git a/.gradle/7.4/checksums/md5-checksums.bin b/.gradle/7.4/checksums/md5-checksums.bin deleted file mode 100644 index 6d1b10039bddbb2368742d7582f96b6ac3e998c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19347 zcmeI(`%6<%00;1^JN|KtdS_U@k zt#x9x@rg2Z8j zEyC#HGJ1$32tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00jOQftBP&Cexdd_*fec z?6U-6wul@!=BGW6KYQR*0zEBn=D!~_O^#EEcYBV|JUoNvZ#svf44R{lS$>Y^T|Hsh zSyjgjY@E$J|ME6(j=tP&kmeC7JRdyKH?=}&ET(y6BF~3cDf>e7&)D_htvnxpwaVa8 zUht638_M%Zb_MJG+$UzRar}5bqjbrLm-MoV=JL}#51c=5U|>#i3C$z?c^<6G{OHu2 z%*Kxx$MYq1iqG~BJImQPwmgq%T9*}&?e>F>qvLsO;_vEeeRLYj|L{DqZ0!WE*rexd zoCQ2jz1|?##|%zk*O&2}?*+lClAgmB0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_ z009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AV3A?lASkMJ&dbERnB?$+ny`a zhu4HWb-DD~nfwzy|4>BzO?qv@9FIu<#L&GC~qtcNWdFTMBIZIt)xP8K?Sh>dhQM;fYjd)Zyua2cba zc8G3ny`WM>O1iFe3&mt?av!S|VYD&b*K&?Tshzl{qt+{D^^IkQ-r$3*;X@muT+2pW zx@%*eP46qWrB7^Y7OHz#V-0PHlPnwU%7Ax;+U;3SwpCuLJfW1bhLSeyw3dxh+1Kx3 z{Z?)9JG^6ywGRHQv6nWc23j@(r9t=K2pYu}o25@bZ;+7pJxq6Qd~#$FZ6+JD=OI!^ zMQ!R1twuffTEYES8rCQ>6$IyHmW_1x{)F!1f=f@z5_6}>1rg5>eCmXXlQqo!$ z)Md*imiX?p3D>AcfbA0eE{@0@AsUQ1ywZ@QFSxk+4v>`GI zm^A`Yj%1wdj5^&lbnBCI;XPtwYCNJ1=P|y!7iWfkS>btLU|3h*HLq|;%^EFij(wJM dl!RAAOO%JjTZ=vgP0=r0%o?4vAwFYl`~}OWw(tM| diff --git a/.gradle/7.4/checksums/sha1-checksums.bin b/.gradle/7.4/checksums/sha1-checksums.bin deleted file mode 100644 index 827be0272b37f26d6f497b46127b268c0f057a6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20387 zcmeI3do)#99LJBVJaR>$Nz$!^JW@(eDuu%Jh|zF8B2(!x4Ph!Nio{e)l1dGQ+=@c- z7_UN7nNU=kS)`|m6s553nL2E$70+*hvfN%PDAIl>1yIUgyf}9e0`3_9k;># zc$56<5Z7pxZ8`%ew|-3WrX#n;cD{RCjr(aM`Qy}4MOWp!{ZMWnP4cH2YqoNHo9E(w zHj%vjg_**gX|oGa&R_RA|1@jRN5zAoI8P;c=ew@q&ABi2P;PsG)vOh21KNIB+*GVp0BG-2<>9r8$_8KIYi;eI|H}Amr(Qziphj1RG9qXxChT7XW zl3b;pGk9@oLNl)GMRGGM<8>zPiNE3YQ6!&xtB2z~Fl8;S>qK(PzECZ{^_r(}KQ$y@ z9Nph#m2Y8-a>w-~cZzGP$1ty1!WuDdaM%C8%EUIqk3aiJ|2SjoD+0^#g z8n+C3t!Jh>tKDhu-s-c|bLLS*mCGYamZ>RG>)%le)4Zz2CFpgx-Sm;+Z8)3%OSf_g zu7%%9&w0SEr5Dt&q@sn_)t)Fa*`c`l&E^ibPDEA6(XAz%~E6UQC&aDe0li8~76Q(yR(x(swmh>!iD1U&#keqogu31x(qCDJndGP1)>k z?NC=LN-6d2ZK(J*gZDOzjavl&TY(@|>I~J+Z5Jex7pX zN#A#+u5m5l&oFfuQ3^_IDmXmEJ}aa-VvLv0%H@~*$CwI_&^tNAYaljV?~16w5xFVoUpYkUWHVBZ;~}rfzzsF6%fi4huGiN+PwDW9pU z{-|9d9O(7e@TGSnF|`Ck#gtS$vwKB?3N4slCKc5FKBH07O>fIbK5uf;Lrm$5DQSb% zY-*rRS>HYd3CLMF%fs;XSHIA`MISixjT_;%KPT%X(|(ZGxOp+f8{sGZ`m-X zcoe3Xl|&!kFn2&=gl}Wln%10kuWOAt$cwy~Z`-o@8ok>|Jg=2vNJ^90#UnwLM2*Os za>BsIweCt5w?UZDspg2E6hWw%l2)%_Q(lvmH|P1UId}bRWmj`|kkeM~HhMndT6G)(=6CO)x6g@3h}NN0|3)@-A%pW|{=@e= b!Q(BRTmLkEd&%ihGN$OKlRh{~%NXh}FD|}G diff --git a/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock deleted file mode 100644 index 1b535cb7549222b3281e5afc50e7aeae4e249f5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 TcmZSnu=|bT7bd}G1}FdkIhh1T diff --git a/.gradle/7.4/dependencies-accessors/gc.properties b/.gradle/7.4/dependencies-accessors/gc.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/.gradle/7.4/executionHistory/executionHistory.bin b/.gradle/7.4/executionHistory/executionHistory.bin deleted file mode 100644 index 8a1ccf90dda0a2576c7036a0c8dc51f0102e31db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32078 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 PCPjCoS>Gu$REz!tL+T|N diff --git a/.gradle/7.4/executionHistory/executionHistory.lock b/.gradle/7.4/executionHistory/executionHistory.lock deleted file mode 100644 index 542e679f7ec569a5a8985a9c4c1123a0c7a60f16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 TcmZSfpWN%Jqqazk0RjX8B$)!| diff --git a/.gradle/7.4/fileChanges/last-build.bin b/.gradle/7.4/fileChanges/last-build.bin deleted file mode 100644 index f76dd238ade08917e6712764a16a22005a50573d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1 IcmZPo000310RR91 diff --git a/.gradle/7.4/fileHashes/fileHashes.bin b/.gradle/7.4/fileHashes/fileHashes.bin deleted file mode 100644 index 5d6f16194c6300b85a2de7ec4ab75339ba182a77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19647 zcmeI3e^Aq99LK+7V=@~c1w@yn%MO?*BGv6+0f9SY`!cQwCNQ`$!OVp7SLsp258+hc zLbL?U0u17`1WcTuLXeVafMaAS5x?}12)UFZgktn;&-0wuzWv`__j&I2{XTndug~*5 zukUw%?fWPg#$(YuY0Sgs_OJ^*FaQR?02lxRU;qq&0WbgtzyKHk17H9QfB`T72EYIq z00Us)|6(8(Eo32HjK>N)OUHQ^!}y6&=kWq<>i$)xK5NP_>?->IL1pXB(Xoc;Zj32K zG;dgY@KmmsMul_sYnoq(J^cITCF2sDM}*S+%gb&2;WZg6NgWf-yLMks4)%REoYc|N z{F-XEleuwdn&i_oH$|&Uy3#w-a2~0p`Au0)Tc+95ALptUXx{t8!M+P4ien@{Li2%n zS?R1|{1H+|O7qb}r{&e+Gi~Jie40;&tbepDP3MdAh#NF#q)(Qw(=TR8o%d+&APbGv z51x!BbvkJ7JaCV#m{EK|@;REjh{~Mq+y7z2xw3-hzRrwy!bIv zX9vycnPKb#@MmxY17H9QfB`T72EYIq00UqE41fVJ00zJS7ytuc01SWuFaQR?02lxR zU;qq&0WbgtzyKHk17H9QfB`T72EYIq00UqE41j_E%D{7IU@3Z89^#iQD!RpUiJ3C7 zqQJZt6{h(HhT-iiR-H}7vs>7K&c6R7j($^JKj-svQfXCFK#J@hdgk9k7}_y0R?8*I ziZ9;I8&B?t4|=Akw)n3`LR`WGbA?M7dNe`9{6cZvGWMdIMxRe+<%)?Vd$>fmF4BLw zJ}jo?(u%D{-pL3np>vAIgh0(Uhf= z846)*Ok0m*Ot+JjV6*v{aJ1|mupuNa9gV}af5z<2P^)XA2KN&}hzSvTZ%brW4wp+- z`>PULcD|H9oq*<#?6TP+Oz`cwM7|SKaNh32kdda`^J#DV@R*fI84AXP@O3VsY0f#$ zD#PEryi$JPyPAHqn*fcGGDLQ1*rN)zvnpjr3WW|6zco&^=Z5#CuC@|MSxP*{f(Klp zLMl2IU*FQX#CzYFxcBn2(k|G1ea(YQ1w24 zwcp_=Z)T`+eN!gNFAdW$%ds(D9|!t7FjP6 z*)+kHWv%H%BT1;y)`P1VB4m$Z&CMuN(;iLig>BsZk+`?Lir>Mu<9k1D+~@61CH;k#A)HZa#HtlwU-eCDTxyNDAm4L4C`Zf{>}UAbI3 z$Xz&{*?n;~ga0bMcI2i@W9KgDEvpLc?@QO^H(PhF7~FJ{ySOmG(-o+^pI*uZ`q4Z` z3U^Urv975W7pK&OZ~xFfs;J~Ha?Y3|NnNwXBZf;tRjGOrcd_@Pk*9eVn%x>1(}?qT zn7NAsPPavp?rIE3ABYC{d_Q;5+nb$y=v+yA_o)wdNhm#=yVzX$Eu$^>N^wf+_*iF? rVjFkyrE`Dg1V3V%RK_=if~HjNBF#v@y8GgIO|R7;4)!eRh%NpA*ttD< diff --git a/.gradle/7.4/gc.properties b/.gradle/7.4/gc.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock deleted file mode 100644 index 39ca530cd62d43fedea3737a5a9106e456413488..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 UcmZR!S+nCYQ^Wdp1_&?(05uT=bN~PV diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties deleted file mode 100644 index 2e9f53b87..000000000 --- a/.gradle/buildOutputCleanup/cache.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Tue Jun 06 10:18:46 KST 2023 -gradle.version=7.4 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin deleted file mode 100644 index 80d25ea252ae12a367d90bde6a548ec554d437b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18983 zcmeI%T}V@L7{~Gd43vDyP)wJC3MIP&5=o3OnmOj}p6)U33w@1LvGSU(Wy8&WGJi zFGSwaT{^`6k+Z+V3IY&-00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOL~?MW8``kyPbn z@=hhi7MXS-bm{UU-_hJQto5({sX`cj@c#!7zq~pd=+8)2wn+}|&I!xh6=^4+bi-}# z^S8E&3O@Jvlx{r4-P`bZ(^~konC8@QUwql`J82yMNWGo=QtpcWk>h7KbwBr&E}Pn} zzBi+ELo4_2{0H-EPxu#g6ZgorE!=DAtEBGb{;f0nZuR}T5Y4x9k5=8xa@x%0^n42U z<1N>g-oCqhf%+Qv634N=J7toa`V;P&+T^Lz{_n#y|0;LAIXLTyy3W({1Kg$ex}K5Q z@*(OP?sZR7AFQ3o&Z2&iyXnm4bJKKv6ZK{8jg6%RB}J|srAu3TeQwZtsl)e)`Z)LN ztwG(nmdR1->w7)aQToDNsHOQ%?l-(;Q>%f_4eDy{UG4=kb3p(A diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe deleted file mode 100644 index 6c53d29c81ae76c79f36b29d1a813858ff4fa1ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8 PcmZQzVC?8izOM-Y2mS(s diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index d405dbed0..000000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index 2b63946d5..000000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 9560ebf55..000000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,248 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build/classes/java/main/CalculatorTest.class b/build/classes/java/main/CalculatorTest.class deleted file mode 100644 index 6827c5e0be50ebb79848260907f0d3e01695d85b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1299 zcmZ`(OHUI~6#j0Zv>gU0=|fr!?ljrgFT z+yhlb1u7XTr+6ZsPH@Mv=ZzFa@x-lUlAB8mfmkueoMQ`fd0Zi9zlv%E7~H~KO_M`i z@Vs3ps-PBi9@MM2ga!u9vX}LhH1VT#RXB#N^Hrfwrc#FO2+K?{s64m1|0K;5v~>rg zQCY@iBGNxZ^p9&9rT2&z&4kO+`XjU-rpgAW))6nRFw~CFHX`i@$RN^32K{{sG_-oq zrlK9!7^;$7n0m2zhVo^@iJB>gn{k7r3x;CHL4-UAtLQ@anNH+YBJQcx zgdk};FOufbdATIFUKKj}7<}Do&E+o8R~_Z8{=pEQpjK|4Gxd9A4;8d+g#K-V;%gH21RtQ@kE-4%$`I(+Wee-{yy{Kjh6Yao_)KUeZ76Szn%HGr5$Z-WMA%NUTtZG zZ*J1IGoOBHhhNvT&$f>?b542pUWVrX94EAFhU#;@V^E4osJ#~mOD1zx+Kw9! zgp{)8tXjQt7^qKj4gp3t%@3_5bkjr<(ob(XJ>{7@{2gqEUR;RKDvtpV2543D1{lN; z?SNrAb>*DjQ7~yY9S(TD!RJ@P;a&LlP_>VmaG>!#)Fh$bXRKNzbZ`nPlIVbsf>%*G zKWgY|q!I0)@$5ze#?XY@XhsYzr$|m0NRH(ETo@&KV=3IgI02Bq0Rm*%oGK`l$Ud%4 zcLlERp>w9YXAeDJ2+T`RnNvz5vsRR&Ete&ncRG=xI;Sap-t?THpPq{>%W#XBNn!5f HVom-9aHKJe diff --git a/build/classes/java/main/Commander.class b/build/classes/java/main/Commander.class deleted file mode 100644 index 3dd96559272dba16a0505ea7e5c7d3219005b1e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3292 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 diff --git a/build/classes/java/main/Memorizer.class b/build/classes/java/main/Memorizer.class deleted file mode 100644 index 4a3842eb66c684c3e5b1599f98683c1899297ea0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1229 zcmZWp+fEZv6kVq+OgkOgQf@*4i-=AOwu*PBfC!q96fdd4=-beql!56Cna*JF*{|@y zS6>BDf+WUgKf!M?;y%-na(S7Y?!ER}Ywxp9fBpUb1HcR(%LpMXA)=rIoeZgUeM>Kz zx>YYeTV3Z>m!Y#{ScW^x5LR<55~2*fKFD(ovsgB)4PGl7O;?75a13!M61o&5kYtE0 z^M>sh@3_Mttr5s}wi&w1?fMrU_qZm?x)r3+Lp69ra|pW0$S(SnwHBZ@N$hB3krX_6too23{oA}e7`!6l5JYQD1Fba{hNwnroAYjGNO z@wsDIZpC%D-q50$pp?7D9iBCsS8|Hc%M)h@Uphe+$j)jc zwqVx?o}|m=Prb$}cV6nNCPmU^yQ-Tjx?_mnK``P{+YIqKcbBZDt6Nn0<>noW$18?1}8?gL_8H&uWl^sn}JxgR5gQjlq&$npZLt^DAa+@NL5T+B5%I|~a4cdCtpyvR}Wy{RHp~&ov|%Mw_1dskG_%?Vj&Mop8SXv6}&d z%8^8h>>I0LGmKk9aHasJIWhv6+^*IdwuoHf;IeePVeN>(Wsa-}C@-r`;a}m%W0XOg zZ@#b^TSPzcb|}A&aZG3!<+zGTYSH#Pfy*#fG^~B+&?)&&uve<@?z`>C)KS1S4bvPm zxK2IK09!%tfSMgTe$TDHXDAm3syBV7+cgIQb`*NSo;lb-5J>)6j+>ZcNL9SRi`HrG zL8`d2YBbYG>a^!<8ksbB8d>2P9E(^ITgyqh43kA;_}jiFa$$XlJZ<2Rkq6SXmc8aM~UlfSq-y?XS)qX9Fvw--23FC?5&G@A6< zm9`)6zA#WIE>s!XeBETw?M^RjyRSSkclJzc%i@iQv*vcA*PU*pp+fopgvP+DLEwh+ zpF(kShqS2_)t3Vu|YRkvB(HeDpqYUom!y z@z3NjEYojF=IHH6Nu?OShJ=jjdA4|hsZ%h4Pn^TAP=x00q@t+b9XrGr7Oj;t_ndp~d41>Ho1dTm z@C3jJihj7@)}ZK6;Sp%RZrn2Bd84=#pIW$XW^Dn_uvN6|Q2}=(I_HBIJ`H{yo1hB> z<}CB0_?VH;*7Am3stEYAO+rVyMW58LnO07anr-FdGq#bv;YS3~-6dYTnc_i2cmB zY??O&wnU<@nrk>9(6Qk)RkY0|v*Je_hjbj4IeV?5J!j-=ru6xij)e5-E|QCx8B}MmmYEFh3*KrzW7^ZAgswU&N z)LF+V8BNLXXLY3Tu7GA$PZ!GeZ3nYU(oI@N29wm>lBrHz69`38%>_3qOG-D>I?mxe ziA=4U6X<^(uCHR{XEAOX)tePaTSarSR#-4A=Z%Ft+t-;caqi}fiY4X7refzTwr8WDTtc>N2YSpCZ=AFV$0`KBW;f7ycEOLH1 zQqIa3fU811pAHC|rxfQZxT*sWA-*Hy!Ysd14Rm6TU%h?+^NzU>7jTg~(m3pB=yC?dSsZpB>8ibwv*10J|*2*L5RuTM^|`o4Y8jPU&FzxBXrUvFOE=m zWWHY1GS2)jo1+9`8J#N_S_S?3R&c^$<|P)7FqTm1{GEGf9}KFGFtLWI`DF}kB$Mzo zf{)Mz^BfF%f@IwsJnYIa1ru&hGaTr(Nj7 z_Z+()$^C*o_!WEc8}{LM_UKRc>@UQGz@XU7r?3lg(Zg3XjKg9Vj)=WTh!~EE{TLBP zF)BuJTuk7kn8zt`1!Ka*xTx{L`xs&I8Pei&WW<-465p~nax%|Cmu4;5@o$zd)@EesLdJEVAQrmgJn*cdl_~i8}`odQN8=+QdH? z*U&2hfq>rEt+(;d`xL6{88dr^sCWwfZ>ZfmZ(r`k-P+9%^0(s!-d3JUPF^c~Lmg`!CK!p|=14 diff --git a/build/classes/java/main/main/Calculator$Ops.class b/build/classes/java/main/main/Calculator$Ops.class deleted file mode 100644 index 8c7bd8e483b273c62fd0f9d2006b70427e4a44f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1152 zcmZuxZBNrs6n^g7ty?W_ju&BqBBHFI43zoS2{VXsNdc3xC5xXfvtmitnXcn^=}3fV zG<^0)8PC1eFl1Y@lXK2P??_yVgL!i9#&0)uWFd4VZDfgMdf9kZ?-TY|v|0 zT7JCy!a$+8P-STIb&ElFI=!&vzV^i2*>kNei#H<99k(03>2xCv70Ul7GzOy<1a2rF z%B7(cQfPIB4q6}?C#zFJrvO=!p|m7EX-RWHt{}7~kd(iVC8~Qs-W*x+(fi1K#n>6f zKaOus3aqqid^m16uF5;Cgi+2Sdt&cFmdaRI+V5#uikt9U5$Bo{)7j;m1U3uuc= z(rlypW;Q9MRYOn>oMYCP=|Jf&O$ U&+uGYi~eco%!FpJuwE_v0SvX^!2kdN diff --git a/build/classes/java/main/main/Calculator.class b/build/classes/java/main/main/Calculator.class deleted file mode 100644 index ed3d3b4250380aa70ff612b80cceb44afdf88dc5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2045 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 diff --git a/build/classes/java/main/main/Memorizer.class b/build/classes/java/main/main/Memorizer.class deleted file mode 100644 index a5bea138e6f943872fd831612d400915dcb5d41d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1244 zcmZWpOHuYe*XdBJ|3$GA*>*xp$+WFh{CCgbemr7R6SD_#rLkBbkof_ik5{Op~ z%gN81RoAoLnVx{M!b;cM6zDD;fxM`jb+aIQyEP=yBM_?|^(0CsQ3@UCL%)In4QFsx zpsNLlLXD**fj+%Kacr1E=8bGlX&Ayefk=(2g1P2mxPY{RVGS2Ca>9o4X3aONta9r# zqpyK!x%uaw<@jaaGmUB?iZQ1A71J}*RxRzg>E@idoQliP6=XDIF)q*(h&|a(Th=9* z?X-v{y5%evG7D1l6%9G$DSF+tZJvRiIX#|&YbUh_04j|Q)6=rG>==ICCL|ShN{QmfVVAFBqOBznj5`&#?tMmQ8=osriOek(CtM za)8o#V}rSN&#cvL+L}B~FN;>(w*qaxRW%7K<^(#+zEN45H`bes(PG7J-cGgb*1d}P z#FFyjhj%U~4aYDo2=T&)pvnstyzz!Y;Ck?WgSS5RWuqSplL(pb@7NxA~Onrd1 zjq}OTZ@9FT`Ut&|nh^MjtMklEF!5d-$nZo%!>5DaQbsrso}&P8`&10lh!py{PXpYb z6w=UXcAi@_i4jT}#Y2n*Qq%0!DO(DZLrgbCtIR%Nm0$$?hlKuMKx2cjm86%#exxVn@HUeeCsbc%6nSQuqt zq7WCjaAD%Y1w=(+3_rl1LQDJy#_vum6~V>ax%b@jz0Nn^{P^{455Of{Q{X{`50xss zsA32%@fEJ8xw)v{nO`ze4nx(nFokoOp&}ef`r&727}KI!OzYFeM>Sm=iD?7cL;wn^ zeNa`@pq8O_mZwv>Gx3U?85$?(7?b=FBE*J>Fg&C{Lx&HY zD!Oo<7EPm<=rak*q}gDP|kF$7YjhENjC;S~Kdori)H4JOLv%3e<~)EovYHvjb9oau;+krY`$_A{nwIlR=LuEfbbye_C( z{$!444D#q*;prSDa_7+V!TN{7vp4zYueJQ!)xyT-!mF+Q-L3q)P3>T9t?*(y|8i3+ zeRDImoqzvb+yAs$c)E44?iv-%2N~M_6Tei7@+Y8WGt?jJ9fML1LhU_4Sfbpsa(2qN zDWsGQN7WjX!$5tKa|kecXnts|pob=skYU>C^pmS&`z()d$3e>tnX+-NlH9FlW(W23z67{a6^mWsFn*MnnVpdUJS6p4L Iy1r(91Lj9DQUCw| diff --git a/build/classes/java/test/CommanderTest.class b/build/classes/java/test/CommanderTest.class deleted file mode 100644 index d986960b5fa141ccb7df18fb0b277170f240d634..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1635 zcmZ`(-%}e^6#i}qB&6G>Y%MJ<;9<=!2mC%YdhSLk`BQ=^-jk)O5?1GlaGPK>$4Ly5{p(WHerp=tj;0-+xJUSUzuYfu)p-bSLaGb`~WJdGj zBK_|7<7I}{LFKA4)Q(r6_;5+WW%M$fJm5R6Wr(RS;qYgWk5l&JRYFq&xQ37qeG_FBsPiZ8Ddd)y!#iHc2~jJe^RJGpebJwY%xf z&g+yZ7(ddd7C5IrN}{`ScMv6tED9+F|V4|&t=!KPpLgwwN`d& zg>`FXYk;Bqf65U;P#x`dHyu^}vF8nyD79jNuWazORmIxgtnNLDC@w>Vua)?6iMSr$ z5X7j;YAMePj}>dV$ctMfj$M&cpS7_sSo5u~tEI;_x~+x?to~W%n|a5b|6y!-I?~Hho|s zEO$RcPdHpgk9_4hu0BJgrGnRK9jV|gnpN;_SiaTh<8Ab*GwgwnQgu?QbM!8s#}#^2 b!?=L!xQKh`KE!sSIor6+mf<6U@nG^l$|n7B diff --git a/build/classes/java/test/test.iml b/build/classes/java/test/test.iml deleted file mode 100644 index 7f4fe5fa8..000000000 --- a/build/classes/java/test/test.iml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin deleted file mode 100644 index 8f0b619520bf1516fd9c7bd11f0f3f2fcc0657c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1351 zcmah|eM}o=9R6LerL~lD(5^C&u3$$+##`n<%EuUZe8`}KjgImmn@4*P!vJWQ2In*p6iV@@H2TBa_T4YMZ_$K$}clW%{ zb5DN1=ZydoLjve=QZ^S3-9qT292T#G;ux0jrpD3A2sW{I?)0ZkD{P9$6aoF@eOwHF z+QSjG@A=MDl$UZ>((_)KK0UWAF+Bi%B;#~aE-TH73BMeIlY-;B<|n!*9rhW8l*A$- zxP}vXZ~lJioYI=q6`gmrqN3q@Syhx4a5)@tdx&6f#>sml=TFx7a#c42=DKJjMnI5u zGOXig)_&IB!IadTxz27!QhLOtDCTlxP!DfuCVpAB3ZJugk{8LBQ^H+c=ut z41UUO!^Ic~L=uSKlTaM{5cJwSZU@zw$YV}=6#)zvNo4?143hxJFbn|HMX_6;&*Pz4 z&c?VrSV#e)F-*#1KK{ACd}~#-1}T%E*G;jM(?h(PnY(cDxf9kSq3IbJyq3}Rx?=X!AMMk>rffy36zFH%w2R}LooOc~hEv~Kc_~RY z)|E8io4+=tD}SUqwdhfljPr|Fh^;FbXdnCO%OAEI@DE1Y(`vS9b$B`)xvhTbxM8WV_^Yg%$4%MDfD}0pZ1K7*p|;|=5NKnW z4x6hr4+37d+hOA;eLJcI4qYDqW{12!Zu*PG@%)nPozV9zZSitcvx6oUXB+3{MG0xt z^MwO1XbkVGiHNowLtJ*Yz5A2zj>V4& z^iwVu!?!79q7(vrx5LtxhdOTeG$bw@sP5k^eUI(3SbG0xUrbVOU!-vArP5vosV^=br^^X;!#Xiz8canz;vL5k&XE4tge$lJWUM>xcI-ce|gOcQ}e@n0l&vU z5lsBI%-T%QUlUnp1AL(yC@Divn##%D`U>a?T?bq!u7n;t)lTssCNiQuWR+fkM^=Vj zrPXM!v5E-S(fd#hY0~cpzlXKp!q7KCEonykabaCmy|xyYH=st+v`T!6G)Fd}17y|e fIglMhPn#%mcO?HaURTnLEJo9+uGMHJLdM`v{RFmw diff --git a/out/production/java-calculator/.idea/.gitignore b/out/production/java-calculator/.idea/.gitignore deleted file mode 100644 index 13566b81b..000000000 --- a/out/production/java-calculator/.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/out/production/java-calculator/.idea/misc.xml b/out/production/java-calculator/.idea/misc.xml deleted file mode 100644 index 07115cdf1..000000000 --- a/out/production/java-calculator/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/out/production/java-calculator/.idea/modules.xml b/out/production/java-calculator/.idea/modules.xml deleted file mode 100644 index eceb8f7e4..000000000 --- a/out/production/java-calculator/.idea/modules.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/out/production/java-calculator/.idea/uiDesigner.xml b/out/production/java-calculator/.idea/uiDesigner.xml deleted file mode 100644 index 2b63946d5..000000000 --- a/out/production/java-calculator/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/out/production/java-calculator/.idea/vcs.xml b/out/production/java-calculator/.idea/vcs.xml deleted file mode 100644 index 35eb1ddfb..000000000 --- a/out/production/java-calculator/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/out/production/java-calculator/README.md b/out/production/java-calculator/README.md deleted file mode 100644 index c1c982e55..000000000 --- a/out/production/java-calculator/README.md +++ /dev/null @@ -1,69 +0,0 @@ -# java_calculator -자바 계산기 구현 미션 Repository입니다. - -### 이곳은 공개 Repo입니다. -1. 여러분의 포트폴리오로 사용하셔도 됩니다. -2. 때문에 이 repo를 fork한 뒤 -3. 여러분의 개인 Repo에 작업하며 -4. 이 Repo에 PR을 보내어 멘토의 코드 리뷰와 피드백을 받으세요. - -### Branch 명명 규칙 + 팀의 PR규칙 정하기 -1. 여러분 repo는 알아서 해주시고 😀(본인 레포니 main으로 하셔두 되져) -2. prgrms-be-devcourse/spring-board 레포로 PR시 branch는 gituser_id을 적어주세요 :) - - base repo : `여기repo` base : `username` ← head repo : `여러분repo` compare : `main`또는 `github_id` -3. 실제 진행할 PR규칙은 멘토+팀원들과 정하여 진행해주세요 :) - - ← head repo : `여러분repo` compare : `main`로 할지 - - 또는 ← head repo : `여러분repo` compare : `github_id`로 할지 -- 참고 : [Github 위치 및 피드백 기준 가이드](https://www.notion.so/backend-devcourse/Github-e1a0908a6bbf4aeaa5a62981499bb215) - -### 과제를 통해 기대하는 역량 - -- 깃허브를 통한 코드리뷰를 경험해보자 -- 기본적인 테스트 코드 작성 및 활용하는 능력해보자 -- 스스로 OOP를 생각하고 코드로 옮길 수 있는 능력해보자 - -### 요구사항 -- 콘솔로 구현입니다.(스윙으로 구현하시는 분들 계실까봐) -- 객체지향적인 코드로 계산기 구현하기 - - [ ] 더하기 - - [ ] 빼기 - - [ ] 곱하기 - - [ ] 나누기 - - [ ] 우선순위(사칙연산) -- [ ] 테스트 코드 구현하기 -- [ ] 계산 이력을 맵으로 데이터 저장기능 만들기 - - 애플리케이션이 동작하는 동안 데이터베이스 외에 데이터를 저장할 수 있는 방법을 고안해보세요. -- (선택) 정규식 사용 - -### 실행결과(콘솔) -``` -1. 조회 -2. 계산 - -선택 : 2 - -1 + 2 -3 - -1. 조회 -2. 계산 - -선택 : 2 - -1 + 2 * 3 -7 - -1. 조회 -2. 계산 - -선택 : 1 - -1 + 2 = 3 -1 + 2 * 3 = 7 - -선택 : 2 - -3 - 2 * 2 --1 -``` - diff --git a/out/production/java-calculator/java-calculator.iml b/out/production/java-calculator/java-calculator.iml deleted file mode 100644 index 56014c63f..000000000 --- a/out/production/java-calculator/java-calculator.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/out/production/src/Calculator$Ops.class b/out/production/src/Calculator$Ops.class deleted file mode 100644 index 3dea36554d36c077d6e7f14553c93f9893b27154..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1117 zcmZuxYflqV5IwiM?Y8TMmhw<4C}PzL&iK0F$5;bkrJ5rPHnetiO3ZWE~|Fx=DrAwbEHK;c~xr&e}W^6Nd_(7cxl$R ziFxAPMQR<>n9(rFaTV8yz3p{T_g!eP{0jL!~fMz2(`xo-q=z!oc-A#%KpYAo&+KZefujQFVPcTxXaWrHU$R z#YPfwomN~(B9#PBA}zckM+s%Iu$-jFFj**GTA9fIrPZzOd)hW_y1uj9KWsU{zTNUD zlK)TF;>FuBWX*2d_8NBJin6Fy_3cBV$X?!d(pV|W?f7=s4+y6eiVb?+YTJu8 zUK}YDcd1_NyKXS(R<|Fto!73IHa*nKl6VxN+jV;3n{F@EP$lp%&%kTG?*#Hu92!L- z4Q{T`@p7cm_~xuoB0!eZCM{`9T9Ou!$q7jbB<1g;Omz>)TO=z!`T&`)m^#DsXYv@9 z=r7B_5-Y`44_y|bpXw3#s_rcW@3Ob>+&v1JVqs= zup$cMJ27N$D<{YwLy^uMRXUnB^bTbmOk=LS{Ohj)e|7b?S88nf?Rabk%9MUD~lufA=Mlh%VX;=iT!==bq1d?&ara zKRgC7jI0kXxD99$Iy?f6*UejIBx7b*Bh$;*t&}a`8A@l<_K1Kx)U!|rFX{~VB=$fG z_{Pjks+2M9T!A1}17xDAiWz7S@H?(cb~+Q8wawHGAL`+*Llc?}v`FklK%k*&bYwbT z6wqc8^RrB=#+y>aR35KM>{CXrnWPVGc-=s|#C{xjp^90%kj}0Oc-PG0+E{MIa_WeC z(IFth%C1x5FpjWJ>t@N!FlHc>*xiL#&ypA2wCM99#HH7ZUM>+;!%>Mo^fT4GW!(_i z8|r!4+`ut`rmEL?*0xryf)5d#ka$z&>`iCw1v68!l+U*$qROW`pUbNjosxK4m8vJ> zQ}eS*5|bEG5-mBOm{Z*tkvQ#iBRQ`0XC%%l=pK(Rs4(La=Ww23@@AoEG5)SP%YBOV z#8vnSi8$UBFw(_y>v{XO)3YVzCLxi;6g9V0s?*m5f}wbA!IjEl%FT?#1-z#^Q!1_r zbib;vFZasFV%#(;AC^Cn&RSEY^<}FtXD(-We9eg*2W`PDq!q3RHG3`1quaA;+3{@A zHnS=2Y~WE;2P!5|M?+^^sSJiL*Tmi_pQYNlJkK_+xOK&)S#Bz~zHVk$1X^BU#n~xX z#Zrbnbrtz(Dm$)@IztCv%=&izdFI`_HxJdM^}L%S^ic2InxvVplW{x#a=)55c4f*c+DS|GkUf&|Y}P7_Wz1sHB6RaQ;ShW7;)CFZPu(eUJ~d6w z%8Slbqn!njW? zYHXW{mToH2)d(MKnp+qO56-+dS3fN_`?D1#Gvkq zdRp~uw0=#u{8^-4QiL=?3XzoTRAs%`sy83p#-Y22x}%;A93$>>aJQy#2k{#Y4(bXw z68AXRWy*f#yvNZh?O5HZkfji>en7F&5S7{GGdK>*n%ci%{hD*Cclfq~gXBVxBh|{;Xj4x$IynX3;~;)S z2Yw;?mHU1}7k)=K{^U9Rg&rXg77aKmTF@t2`5Lz4xahvM{Bt9UgqlH!< zlGD`0RpwT4S7CAP2jd2_@caGp zz&=^eKkpOhuBT`hPg&s;$iJcQle~RvJ9q0aL#W@LNAPmwXSZOe8&-Qu8W<@}nG4r( SgR4eu6Efs{4(G-CXxqOXb(mlP diff --git a/out/production/src/Commander.class b/out/production/src/Commander.class deleted file mode 100644 index 8ea3e86bf567926af9f3ec538ad28d86ea6a586f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3277 zcmaJ^Yj+dZ72Q`4&sZKCAuul+Ec3Kw8v|)cg6#wl*in#q#2{X6+VOZ|4VGpUX=HHP zCT*Z;lco>SS8$+pXj1n96ih3;lC{!)?#F)bALt@$^=q<7>AoXj%SEd!H1~PV-RGQr z&b|Koe?IyIzyRh$@WHPjpdpAlf$%wfQt!>^_IU4+(Q~HZ3e@#mw&gw};P2>6DNqHL zdz*@`mFXQZblW!b^$4Lsfu^AmO-r!4nG>u{BHCp*sh`1vut67KniK+yfkX3 zhFy33^DRL&fWp3gh>cr?ohwYNu)W=y?c zM)PKmTx@TbK8kBNfP(@dL(dq+jP5#gl9r4wjOe8yJf|R`;dvb5#>FLi_K_6bQX5nv zLbeZUIE*6#tF!uq8Fy?$cTZYwn!SRn+ipPyF;T;*5eOWUvM<#3S1lPC)Z-dXNa_R% z`lPAgq(F2ral8Z=whCF@HPQz!7-r7399zL@fi`cK7uLhY?5LR^bn@J`ut^f)tcI^h zwgiogQ!r(8Uexe4e4UiE3J0ul8QYqaWOznNkuFJ*F%2eOVuqV97xj#1e^unm`QIl4 znx;gLigRpYDl%+(rM#`dk*QXfG3{|TEvH`AkOwu@8EHMgk01hcXZ_7-Zl4(|_;u~DJe`)5^i`SxiNaKz8mWEfQ6N6r+NkhM_ z;XBfFW!$VJeK#&@xP_5WDrv%5O>BXu}tPx z+3Cmi(F|uINr&u8>3K_zE0X~?ZPCbvN(dNM_k>Q z7}j&1%?d8_eA+B5{tW)&5|%EjdhL`;ab3@kQ$+1IGL(qY7aSLu<&kdVy+8HY>tHbX@_yhi^;D$`Vn*y5`U2EBs&V<=p_Ha3$2X%v`V@lxN z>bh3hSXTNRZ;gyu*qn5niDIs=%2Sn4Rn06BJkDxWV|#TZAEnIWDoD1>h~=7nD*i++ zlw(VZ3l(=rZV?@b3Rb*?yiDU6y-+X<3jQpxS)rgLu;Kr2CB4cfqn%0QV?Ffo zPUOwRUPxA7whAj9p8@>7$x$y`!8RDX2XTiTAKv0uE^`t;;8&~k-^LF)s+Wn$848Pk z!_PkOw~wKmoIPiFRiwQ3CQi{Z>4&#ioq#6JF6TEwr>?{rG$YCv z$|k-+IBm9_{hdBEa>hV*5 z8{WZB5#R|be#X@xv0lW_IVY&Okth9)zvUD?$(C<4$>i)uQnW zbSrpL!PU zPU8vxjjo7Zf-#K^U6FCG)7%xYypGltnPBG%l)x+k{%HjLH!k_a?88#v29=iGzm*39 zahi01G(5-v4ASXCXu%!lHg8}NhipJGYeqDH0Rft;VC})UxFnPazq+X1{+4;0es>C z){D=<|3T{G%eaDXh;s5@n&>9KBM)H)T=_kIbv60HmWzBf~Uv6?AOC zD2;v}*DFeQdAotYJYHKY2l5XH@EzgDOI0NyfZuq2Rq??Bs7}uapm83r-^I3hym1%% p7a^1tsoWl-vJa`$hu>nBZ4-OHqwp>7dmD3{3vqmxJiUjt{{=ay25kTU diff --git a/out/production/src/Memorizer.class b/out/production/src/Memorizer.class deleted file mode 100644 index 4a3842eb66c684c3e5b1599f98683c1899297ea0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1229 zcmZWp+fEZv6kVq+OgkOgQf@*4i-=AOwu*PBfC!q96fdd4=-beql!56Cna*JF*{|@y zS6>BDf+WUgKf!M?;y%-na(S7Y?!ER}Ywxp9fBpUb1HcR(%LpMXA)=rIoeZgUeM>Kz zx>YYeTV3Z>m!Y#{ScW^x5LR<55~2*fKFD(ovsgB)4PGl7O;?75a13!M61o&5kYtE0 z^M>sh@3_Mttr5s}wi&w1?fMrU_qZm?x)r3+Lp69ra|pW0$S(SnwHBZ@N$hB3krX_6too23{oA}e7`!6l5JYQD1Fba{hNwnroAYjGNO z@wsDIZpC%D-q50$pp?7D9iBCsS8|Hc%M)h@Uphe+$j)jc zwqVx?o}|m=Prb$}cV6nNCPmU^yQ-Tjx?_mnK``P{+YIqKcbBZDt6Nn0<>noW$18?1}8?gL_8H&uWl^sn}JxgR5gQjlq&$npZLt^DAa+@NL5T+B5%I|~a4 - - - - - - - - - - - \ No newline at end of file diff --git a/out/test/test/CalculatorTest.class b/out/test/test/CalculatorTest.class deleted file mode 100644 index 5130ee1add7e256d900723c4151aa2147169a41f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1312 zcmZ`&OHUI~7(JJVZHJLZ5fpqd3TRt|LXn5!3sIBCiisLFt}b*YN$bN2z5H@ zu}`3RUOtk^oV4eXw`S+ftS_+dyk%SdMS<<_e*bgPV1NTKqOlk1M9cP_Hd4;$+|q-!a=0@nEtEb898t#@@JCIt3xkt<)3j@yClTX}QF@+`(r z+P34%$`rdZdr$hRMRnxkX_+^fvHp?F1tfB7EAz(EhvKt0h3Bu0!rQ0C{i%*4@D@L{b!uub_@6S(*PgXaUNNa7pBCw|mm zl&d;c>ljzP?0|8cr3IWLUQ-HQW-{fMNkl_m5eX*}Ul3VC(>huc(GDWb+79Tjg8uA) zjwRM(P+bqZNW*Ui3Y?;1``pYC5n|3`vl1sY32ouFGc8qia!k|+mlDbZ4rn75ew TWlS=%fozrBN|!68TvPu5&Mq(k diff --git a/out/test/test/CommanderTest.class b/out/test/test/CommanderTest.class deleted file mode 100644 index d986960b5fa141ccb7df18fb0b277170f240d634..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1635 zcmZ`(-%}e^6#i}qB&6G>Y%MJ<;9<=!2mC%YdhSLk`BQ=^-jk)O5?1GlaGPK>$4Ly5{p(WHerp=tj;0-+xJUSUzuYfu)p-bSLaGb`~WJdGj zBK_|7<7I}{LFKA4)Q(r6_;5+WW%M$fJm5R6Wr(RS;qYgWk5l&JRYFq&xQ37qeG_FBsPiZ8Ddd)y!#iHc2~jJe^RJGpebJwY%xf z&g+yZ7(ddd7C5IrN}{`ScMv6tED9+F|V4|&t=!KPpLgwwN`d& zg>`FXYk;Bqf65U;P#x`dHyu^}vF8nyD79jNuWazORmIxgtnNLDC@w>Vua)?6iMSr$ z5X7j;YAMePj}>dV$ctMfj$M&cpS7_sSo5u~tEI;_x~+x?to~W%n|a5b|6y!-I?~Hho|s zEO$RcPdHpgk9_4hu0BJgrGnRK9jV|gnpN;_SiaTh<8Ab*GwgwnQgu?QbM!8s#}#^2 b!?=L!xQKh`KE!sSIor6+mf<6U@nG^l$|n7B diff --git a/out/test/test/test.iml b/out/test/test/test.iml deleted file mode 100644 index 7f4fe5fa8..000000000 --- a/out/test/test/test.iml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From ec0af0a829ef178332e0bedb9f19c16a8d48f642 Mon Sep 17 00:00:00 2001 From: BeommoKoo Date: Thu, 8 Jun 2023 14:07:10 +0900 Subject: [PATCH 08/16] refactoring.. --- src/main/java/CalculateProgram.java | 15 +++ src/main/java/Calculator.java | 81 ------------- src/main/java/Commander.java | 18 --- src/main/java/Number.java | 2 - src/main/java/Operator.java | 3 - src/main/java/View/InputView.java | 108 ------------------ src/main/java/View/OutputView.java | 32 ------ src/main/java/controller/Controller.java | 63 ++++++++++ src/main/java/domain/Command.java | 59 ++++++++++ src/main/java/domain/Menu.java | 39 +++++++ src/main/java/repository/MapRepository.java | 9 ++ .../java/{Model => repository}/Memorizer.java | 2 +- src/main/java/repository/Repository.java | 6 + src/main/java/service/Calculator.java | 53 +++++++++ src/main/java/service/Operator.java | 56 +++++++++ src/main/java/view/ConsoleInput.java | 64 +++++++++++ src/main/java/view/ConsoleOutput.java | 35 ++++++ src/main/java/view/Input.java | 8 ++ src/main/java/view/Output.java | 7 ++ src/test/CalculatorTest.java | 9 +- src/test/CommanderTest.java | 58 +++++----- 21 files changed, 450 insertions(+), 277 deletions(-) create mode 100644 src/main/java/CalculateProgram.java delete mode 100644 src/main/java/Calculator.java delete mode 100644 src/main/java/Commander.java delete mode 100644 src/main/java/Number.java delete mode 100644 src/main/java/Operator.java delete mode 100644 src/main/java/View/InputView.java delete mode 100644 src/main/java/View/OutputView.java create mode 100644 src/main/java/controller/Controller.java create mode 100644 src/main/java/domain/Command.java create mode 100644 src/main/java/domain/Menu.java create mode 100644 src/main/java/repository/MapRepository.java rename src/main/java/{Model => repository}/Memorizer.java (93%) create mode 100644 src/main/java/repository/Repository.java create mode 100644 src/main/java/service/Calculator.java create mode 100644 src/main/java/service/Operator.java create mode 100644 src/main/java/view/ConsoleInput.java create mode 100644 src/main/java/view/ConsoleOutput.java create mode 100644 src/main/java/view/Input.java create mode 100644 src/main/java/view/Output.java diff --git a/src/main/java/CalculateProgram.java b/src/main/java/CalculateProgram.java new file mode 100644 index 000000000..4a373a02b --- /dev/null +++ b/src/main/java/CalculateProgram.java @@ -0,0 +1,15 @@ +package main.java; + +import main.java.controller.Controller; +import main.java.repository.MapRepository; +import main.java.service.Calculator; +import main.java.view.ConsoleInput; +import main.java.view.ConsoleOutput; + +public class CalculateProgram { + + public static void main(String[] args) { + new Controller(new ConsoleInput(), new ConsoleOutput(), new Calculator(), new MapRepository()).run(); + } + +} diff --git a/src/main/java/Calculator.java b/src/main/java/Calculator.java deleted file mode 100644 index 7bf4517a7..000000000 --- a/src/main/java/Calculator.java +++ /dev/null @@ -1,81 +0,0 @@ -import java.util.Stack; - -public class Calculator { - - // for operation enum. - private enum Ops { PLUS, MINUS, MULT, DIV } - - // for Plus / Minus Operation history. - private static Ops PM; - - // for Multiply / Divide Operation history. - private static Ops MD; - - private static Calculator calculator = new Calculator(); - - private Calculator() {} - - public static Calculator getInstance() { return calculator; } - - public int calculate(String[] command) { - int result = 0; - Stack st = new Stack<>(); - - // 처음의 수를 더해주기 위함. - PM = Ops.PLUS; - for(int i = 0; i < command.length; i++) { - if(i % 2 == 1) { - switch (command[i]) { - // + or - : flush. - case "+" : - if(PM == Ops.PLUS) - result += st.peek(); - else - result -= st.peek(); - st.pop(); - // 이후 st.peek()를 더해줄지 빼줄지의 flag. - PM = Ops.PLUS; - break; - case "-" : - if(PM == Ops.PLUS) - result += st.peek(); - else - result -= st.peek(); - st.pop(); - PM = Ops.MINUS; - break; - // * or / : just memoizing. - case "*" : - MD = Ops.MULT; - break; - case "/" : - MD = Ops.DIV; - break; - } - } - - // 정수 -> 연산해서 stack push or 그냥 push. - else { - int tmp = Integer.parseInt(command[i]); - if(st.isEmpty()) - st.push(tmp); - else { - int top = st.peek(); - st.pop(); - if(MD == Ops.MULT) - st.push(top * tmp); - else - st.push(top / tmp); - } - } - } - - // 마지막 command의 숫자까지 처리. - if(PM == Ops.PLUS) - result += st.peek(); - else - result -= st.peek(); - - return result; - } -} diff --git a/src/main/java/Commander.java b/src/main/java/Commander.java deleted file mode 100644 index 6090d9029..000000000 --- a/src/main/java/Commander.java +++ /dev/null @@ -1,18 +0,0 @@ -import Model.Memorizer; - -public class Commander { - - // memorizer, calculator : Singleton. - private static Memorizer memorizer = Memorizer.getInstance(); - - private static Calculator calculator = Calculator.getInstance(); - - - - - - - public static void main(String[] args) { - getMenu(); - } -} diff --git a/src/main/java/Number.java b/src/main/java/Number.java deleted file mode 100644 index 5c4d46a4c..000000000 --- a/src/main/java/Number.java +++ /dev/null @@ -1,2 +0,0 @@ -public class Number { -} diff --git a/src/main/java/Operator.java b/src/main/java/Operator.java deleted file mode 100644 index 958be1270..000000000 --- a/src/main/java/Operator.java +++ /dev/null @@ -1,3 +0,0 @@ -public enum Operator { - -} diff --git a/src/main/java/View/InputView.java b/src/main/java/View/InputView.java deleted file mode 100644 index bdc7bb7d2..000000000 --- a/src/main/java/View/InputView.java +++ /dev/null @@ -1,108 +0,0 @@ -package View; - -import java.util.InputMismatchException; -import java.util.Scanner; - -public class InputView { - - Scanner scanner = new Scanner(System.in); - private static final String ERROR_MESSAGE = "Unavailable Input !! Please re-type!!"; - - public static final int SHOWMENU = 1; - public static final int CALCULATEMENU = 2; - public static final int EXITMENU = 3; - - // TODO : 메서드명 수정 - public void getMenuInput() { - try { - while(true) { - // TODO : 메뉴가 늘어나면 if 계속추가해야된다. - int menu = scanner.nextInt(); - - if(menu == EXITMENU) { - System.out.println("Exit"); - break; - } - // 조회 - else if(menu == SHOWMENU) { - OutputView.showHistory(); - } - // 계산 - else if(menu == CALCULATEMENU) { - // scanner buffer 비우기 위함. - // TODO : 입력받는건 또 다른 메소드로 빼자. - // TODO : 리턴값만 받아서 save. - String[] commandArr = getCommandInput(); - if(commandArr.equals(null)) { - System.out.println(ERROR_MESSAGE); - continue; - } - // commandArr check - int result = calculator.calculate(commandArr); - System.out.println("result : " + result); - String resultStr = command + " = " + result; - memorizer.save(resultStr); - } - - else { - System.out.println("You've typed wrong menu!! Please re-type!!"); - scanner.nextLine(); - } - } - } - // Problem : - // 선택 : 2 + 3 / 2같은, nextint()를 이미 받아버리면 - // 정상작동한다. - catch (InputMismatchException e) { - System.out.println("You've typed wrong menu!! Please re-type!!"); - scanner.nextLine(); - } catch (NumberFormatException e) { - System.out.println("You've typed wrong menu!! Please re-type!!"); - scanner.nextLine(); - } - scanner.close(); - } - - private String[] getCommandInput() { - String command = scanner.nextLine(); - - String[] commandArr = command.split(" "); - - if(isValidCommand(commandArr)) - return commandArr; - - return null; - } - private boolean isValidCommand(String[] commandArr) { - String commandEntity; - for(int i = 0; i < commandArr.length; i++) { - commandEntity = commandArr[i]; - if(i % 2 == 0) { - if() - return false; - } - else { - if() - } - } - } - private static boolean check(String[] command) { - String s; - for(int i = 0; i < command.length; i++) { - s = command[i]; - if(i % 2 == 0) { - if(!isDigit(s)) { - return false; - } - } - else { - if( (s.equals("+") || s.equals("-") || s.equals("*") || s.equals("/") ) == false ) - return false; - } - } - - return true; - } - - -} diff --git a/src/main/java/View/OutputView.java b/src/main/java/View/OutputView.java deleted file mode 100644 index c657607d3..000000000 --- a/src/main/java/View/OutputView.java +++ /dev/null @@ -1,32 +0,0 @@ -package View; - - -import Model.Memorizer; - -public class OutputView { - - Memorizer memorizer = Memorizer.getInstance(); - - public static void showHistory() { - int times = history.size(); - - if(times == 0) { - System.out.println("there is no history.."); - return; - } - - while(times > 0) { - String result = history.poll(); - System.out.println(result); - times--; - history.add(result); - } - } - - public static void printMenu() { - System.out.println("1. 조회"); - System.out.println("2. 계산"); - System.out.println(); - System.out.print("선택 : "); - } -} diff --git a/src/main/java/controller/Controller.java b/src/main/java/controller/Controller.java new file mode 100644 index 000000000..3353e9721 --- /dev/null +++ b/src/main/java/controller/Controller.java @@ -0,0 +1,63 @@ +package main.java.controller; + +import main.java.domain.Command; +import main.java.domain.Menu; +import main.java.repository.MapRepository; +import main.java.service.Calculator; +import main.java.view.ConsoleInput; +import main.java.view.ConsoleOutput; + +import static main.java.view.ConsoleInput.*; + + +public class Controller { + + ConsoleInput consoleInput; + ConsoleOutput consoleOutput; + Calculator calculator; + MapRepository mapRepository; + + public Controller(ConsoleInput consoleInput, ConsoleOutput consoleOutput, Calculator calculator, MapRepository mapRepository) { + this.consoleInput = consoleInput; + this.consoleOutput = consoleOutput; + this.calculator = calculator; + this.mapRepository = mapRepository; + } + + public void run() { + Menu menu; + Command command; + int result; + + while(true) { + consoleOutput.printMenu(); + + // menu 객체로 만듦. + menu = consoleInput.getMenuInput(); + consoleInput.flushBuffer(); + switch (menu.getMenuNum()) { + case SHOWMENU: + // showHistory input으로 Repository + // query 결과 넣어주면 될 듯. + consoleOutput.showHistory(); + break; + case CALCULATEMENU: + command = new Command(consoleInput.getLine()); + if(!command.isValidCommand()) { + consoleOutput.printError(); + break; + } + command.parseComamand(); + result = calculator.calculate(command); + System.out.println(result); + break; + case EXITMENU: + consoleOutput.exitProgram(); + break; + default: + consoleOutput.printError(); + } + } + } + +} diff --git a/src/main/java/domain/Command.java b/src/main/java/domain/Command.java new file mode 100644 index 000000000..5068bb95b --- /dev/null +++ b/src/main/java/domain/Command.java @@ -0,0 +1,59 @@ +package main.java.domain; + +import main.java.service.Operator; + +public class Command { + + public String[] commandArr; + public int[] numberArr; + public Operator[] optArr; + public String calculateResult; + public int optCount; + + public Command(String[] commandArr) { + this.commandArr = commandArr; + this.optCount = commandArr.length / 2; + this.numberArr = new int[optCount + 1]; + this.optArr = new Operator[optCount]; + } + + public void parseComamand() { + for(int i = 0; i < commandArr.length; i++) { + if(i % 2 == 0) { + numberArr[i / 2] = Integer.parseInt(commandArr[i]); + continue; + } + optArr[i / 2] = Operator.stringToOperator(commandArr[i]); + } + } + + public boolean isValidCommand() { + if((isValidNumber() && isValidOperator()) == true) + return true; + return false; + } + + private boolean isStringDigit(String Number) { + for (int i = 0; i < Number.length(); i++) { + if (!Character.isDigit(Number.charAt(i))) { + return false; + } + } + return true; + } + + private boolean isValidNumber() { + for(int i = 0; i < this.commandArr.length; i += 2) + if(!isStringDigit(this.commandArr[i])) + return false; + return true; + } + + private boolean isValidOperator() { + for(int i = 1; i < this.commandArr.length; i += 2) { + if(!Operator.isValidOperator(this.commandArr[i])) + return false; + } + return true; + } +} diff --git a/src/main/java/domain/Menu.java b/src/main/java/domain/Menu.java new file mode 100644 index 000000000..3322498c1 --- /dev/null +++ b/src/main/java/domain/Menu.java @@ -0,0 +1,39 @@ +package main.java.domain; + +import java.util.Arrays; + +// 메뉴도 하나의 Data 단위. +public enum Menu { + EXIT(0, "종료"), + SHOW(1, "조회"), + CALCULATE(2, "계산"), + SELECT(0, "선택 : "); + + private final int menuNum; + private final String menuName; + + Menu(int menuNum, String menuName) { + this.menuNum = menuNum; + this.menuName = menuName; + } + + public int getMenuNum() { + return menuNum; + } + + public String getMenuName() { + return menuName; + } + + public static Menu getMenu(int menu) { + return Arrays.stream(values()) + .filter(value -> value.menuNum==(menu)) + .findAny() + .orElse(null); + } + + @Override + public String toString() { + return menuNum + ". " + menuName; + } +} diff --git a/src/main/java/repository/MapRepository.java b/src/main/java/repository/MapRepository.java new file mode 100644 index 000000000..9cd9a1b5c --- /dev/null +++ b/src/main/java/repository/MapRepository.java @@ -0,0 +1,9 @@ +package main.java.repository; + +public class MapRepository implements Repository { + @Override + public void saveHistory() {}; + + @Override + public void showHistory() {}; +} diff --git a/src/main/java/Model/Memorizer.java b/src/main/java/repository/Memorizer.java similarity index 93% rename from src/main/java/Model/Memorizer.java rename to src/main/java/repository/Memorizer.java index 47dac5df4..1500443f2 100644 --- a/src/main/java/Model/Memorizer.java +++ b/src/main/java/repository/Memorizer.java @@ -1,4 +1,4 @@ -package Model; +package main.java.repository; import java.util.LinkedList; import java.util.Queue; diff --git a/src/main/java/repository/Repository.java b/src/main/java/repository/Repository.java new file mode 100644 index 000000000..af65047e6 --- /dev/null +++ b/src/main/java/repository/Repository.java @@ -0,0 +1,6 @@ +package main.java.repository; + +public interface Repository { + void saveHistory(); + void showHistory(); +} diff --git a/src/main/java/service/Calculator.java b/src/main/java/service/Calculator.java new file mode 100644 index 000000000..0dbdba84d --- /dev/null +++ b/src/main/java/service/Calculator.java @@ -0,0 +1,53 @@ +package main.java.service; + +import main.java.domain.Command; + +import java.util.Stack; + +public class Calculator { + + Operator PM; + Operator MD; + + public Calculator() {} + + public int calculate(Command command) { + PM = Operator.PLUS; + MD = Operator.MULTIPLY; + int result = 0; + int[] numberArr = command.numberArr; + Operator[] optArr = command.optArr; + + Stack st = new Stack<>(); + + // 처음의 수를 더해주기 위함. + for(int i = 0; i < command.optCount; i++) { + // nums + stackPush(numberArr[i], st); + + // opts + if(optArr[i].decideToCalculate()) { + result = PM.calculateOpt(result, st.peek()); + PM = optArr[i]; + st.pop(); + continue; + } + MD = optArr[i]; + } + + stackPush(numberArr[command.optCount], st); + // 마지막 command의 숫자까지 처리. + result = PM.calculateOpt(result, st.peek()); + return result; + } + + private void stackPush(int number, Stack st) { + if(st.isEmpty()) { + st.push(number); + return; + } + int top = st.peek(); + st.pop(); + st.push(MD.calculateOpt(top, number)); + } +} diff --git a/src/main/java/service/Operator.java b/src/main/java/service/Operator.java new file mode 100644 index 000000000..dcdf49734 --- /dev/null +++ b/src/main/java/service/Operator.java @@ -0,0 +1,56 @@ +package main.java.service; + +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.function.BiFunction; + +public enum Operator { + PLUS("+", (a, b) -> (a + b)), + MINUS("-", (a, b) -> (a - b)), + MULTIPLY("*", (a, b) -> (a * b)), + DIVIDE("/", (a, b) -> (a / b)); + + public final String optName; + private final BiFunction biFunction; + private Operator status; + + Operator(String optName, BiFunction biFunction) { + this.optName = optName; + this.biFunction = biFunction; + } + + public boolean decideToCalculate() { + if(this == PLUS || this == MINUS) + return true; + return false; + } + + public Integer calculateOpt(Integer a, Integer b) { + return this.biFunction.apply(a, b); + } + + // for checking valid operator input. + private static List toStringArray(Operator[] operators) { + String[] optNames = new String[operators.length]; + for(int i = 0; i < operators.length; i++) + optNames[i] = operators[i].optName; + return Arrays.asList(optNames); + } + + public static boolean isValidOperator(String comp) { + // Operator 의 optName(+ - / =) 에 해당하는 optNames List를 만들고 + // 인자인 comp가 optNames안에 들어있는지 검사. + List optNames = toStringArray(Operator.values()); + if(optNames.contains(comp)) + return true; + return false; + } + + public static Operator stringToOperator(String operator) { + return Arrays.stream(values()) + .filter(value -> value.optName.equals(operator)) + .findAny() + .orElse(null); + } +} diff --git a/src/main/java/view/ConsoleInput.java b/src/main/java/view/ConsoleInput.java new file mode 100644 index 000000000..b4ef3acdc --- /dev/null +++ b/src/main/java/view/ConsoleInput.java @@ -0,0 +1,64 @@ +package main.java.view; + +import main.java.domain.Menu; + +import java.util.Scanner; + +import static main.java.domain.Menu.getMenu; +import static main.java.service.Operator.isValidOperator; + + +public class ConsoleInput implements Input{ + + private static final Scanner scanner = new Scanner(System.in); + public static final String ERROR_MESSAGE = "Unavailable Input !! Please re-type!!"; + private static final String DELIMINATOR = " "; + public static final int SHOWMENU = 1; + public static final int CALCULATEMENU = 2; + public static final int EXITMENU = 0; + + @Override + public Menu getMenuInput() { + return getMenu(scanner.nextInt()); + } + + @Override + public String[] getLine() { + return scanner.nextLine().split(DELIMINATOR); + } + public static void scannerClose() { + scanner.close(); + } + public void flushBuffer() { + scanner.nextLine(); + } + + + // 각각 숫자 , 연산자에 대해 맞는 command인지 검사. + public boolean isValidCommand(String[] commandArr) { + String commandEntity; + for(int i = 0; i < commandArr.length; i++) { + commandEntity = commandArr[i]; + if(i % 2 == 0) { + if(!checkIsNumber(commandEntity)) + return false; + } + else { + if(!isValidOperator(commandEntity)) + return false; + } + } + return true; + } + + private static boolean checkIsNumber(String commandEntity) { + for(int i = 0; i < commandEntity.length(); i++) { + if(!Character.isDigit(commandEntity.charAt(i))) + return false; + } + + return true; + } + + +} diff --git a/src/main/java/view/ConsoleOutput.java b/src/main/java/view/ConsoleOutput.java new file mode 100644 index 000000000..b2c87716c --- /dev/null +++ b/src/main/java/view/ConsoleOutput.java @@ -0,0 +1,35 @@ +package main.java.view; + +import main.java.domain.Menu; + +import static main.java.view.ConsoleInput.ERROR_MESSAGE; +import static main.java.view.ConsoleInput.scannerClose; + +public class ConsoleOutput implements Output{ + + private static final String EXIT_MESSAGE = "EXIT CALCULATOR PROGRAM"; + + // 자원정리의 주체가 output이 돼도 되나? + @Override + public void exitProgram() { + scannerClose(); + System.out.println(EXIT_MESSAGE); + } + + @Override + public void showHistory() { + + } + + public void printError() { + System.out.println(ERROR_MESSAGE); + } + @Override + public void printMenu() { + Menu[] menus = Menu.values(); + for(int i = 0; i < menus.length - 1; i++) + System.out.println(menus[i]); + System.out.println(menus[menus.length - 1].getMenuName()); + } + +} diff --git a/src/main/java/view/Input.java b/src/main/java/view/Input.java new file mode 100644 index 000000000..0720d85dd --- /dev/null +++ b/src/main/java/view/Input.java @@ -0,0 +1,8 @@ +package main.java.view; + +import main.java.domain.Menu; + +public interface Input { + Menu getMenuInput(); + String[] getLine(); +} diff --git a/src/main/java/view/Output.java b/src/main/java/view/Output.java new file mode 100644 index 000000000..b2246411b --- /dev/null +++ b/src/main/java/view/Output.java @@ -0,0 +1,7 @@ +package main.java.view; + +public interface Output { + void exitProgram(); + void showHistory(); + void printMenu(); +} diff --git a/src/test/CalculatorTest.java b/src/test/CalculatorTest.java index 079c38ece..be3c9fdf0 100644 --- a/src/test/CalculatorTest.java +++ b/src/test/CalculatorTest.java @@ -1,3 +1,5 @@ +import main.java.domain.Command; +import main.java.service.Calculator; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -6,7 +8,7 @@ class CalculatorTest { String command; - + Calculator calculator = new Calculator(); @DisplayName("calculate함수는 띄어쓰기로 파싱된 commandArr를 계산하는 함수.") @Test void calculateTest() { @@ -28,8 +30,9 @@ void calculateTest() { } int input(String command) { - Calculator calculator = Calculator.getInstance(); String[] commandArr = command.split(" "); - return calculator.calculate(commandArr); + Command command1 = new Command(commandArr); + command1.parseComamand(); + return calculator.calculate(command1); } } diff --git a/src/test/CommanderTest.java b/src/test/CommanderTest.java index 2a793dc10..aa7805c34 100644 --- a/src/test/CommanderTest.java +++ b/src/test/CommanderTest.java @@ -1,29 +1,29 @@ -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.*; - -public class CommanderTest { - - String command; - String[] commandArr; - - @DisplayName("isDigit함수는 input으로 들어온 String의 첫번째 문자를 검사하여 숫자인지, String인지(첫번째 문자가 char면 String) 판단한다.") - @Test - void isDigitTest() { - assertTrue(Commander.isDigit("123")); - assertFalse(Commander.isDigit("#")); - assertFalse(Commander.isDigit("+")); - } - - @DisplayName("check함수는 input 형식에 맞게, 숫자 연산자 숫자 연산자 가 번갈아 나오는지, 숫자라면 중간에 문자가 껴있는지 체크하고, 연산자라면 사칙연산의 연산자인지 체크한다.") - @Test - void checkTest() { - command = "1 & 2"; - commandArr = command.split(" "); - assertEquals(false, Commander.check(commandArr)); - command = "1 + 3"; - commandArr = command.split(" "); - assertEquals(true, Commander.check(commandArr)); - } -} +//import org.junit.jupiter.api.DisplayName; +//import org.junit.jupiter.api.Test; +// +//import static org.junit.jupiter.api.Assertions.*; +// +//public class CommanderTest { +// +// String command; +// String[] commandArr; +// +// @DisplayName("isDigit함수는 input으로 들어온 String의 첫번째 문자를 검사하여 숫자인지, String인지(첫번째 문자가 char면 String) 판단한다.") +// @Test +// void isDigitTest() { +// assertTrue(Commander.isDigit("123")); +// assertFalse(Commander.isDigit("#")); +// assertFalse(Commander.isDigit("+")); +// } +// +// @DisplayName("check함수는 input 형식에 맞게, 숫자 연산자 숫자 연산자 가 번갈아 나오는지, 숫자라면 중간에 문자가 껴있는지 체크하고, 연산자라면 사칙연산의 연산자인지 체크한다.") +// @Test +// void checkTest() { +// command = "1 & 2"; +// commandArr = command.split(" "); +// assertEquals(false, Commander.check(commandArr)); +// command = "1 + 3"; +// commandArr = command.split(" "); +// assertEquals(true, Commander.check(commandArr)); +// } +//} From 4d4ed8af1b94da71ca515a67d6077362ceec7c37 Mon Sep 17 00:00:00 2001 From: BeommoKoo Date: Thu, 8 Jun 2023 14:08:27 +0900 Subject: [PATCH 09/16] added .idea to gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index a63365857..189a135f0 100644 --- a/.gitignore +++ b/.gitignore @@ -200,4 +200,7 @@ gradle-app.setting # Java heap dump *.hprof +.idea + + # End of https://www.toptal.com/developers/gitignore/api/java,macos,intellij,gradle From bbdccb6ebbec0bb36e4455f53041de5c66853d76 Mon Sep 17 00:00:00 2001 From: BeommoKoo Date: Thu, 8 Jun 2023 14:09:09 +0900 Subject: [PATCH 10/16] applied gitignore --- .idea/compiler.xml | 6 ------ .idea/jarRepositories.xml | 20 -------------------- .idea/misc.xml | 8 -------- .idea/vcs.xml | 6 ------ 4 files changed, 40 deletions(-) delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index b589d56e9..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 de0c4286d..000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f4..000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From 7d3e07f13d2539b3d85005afb48c4d6ccee8b6d4 Mon Sep 17 00:00:00 2001 From: BeommoKoo Date: Thu, 8 Jun 2023 14:45:50 +0900 Subject: [PATCH 11/16] will PR with Wiki --- src/main/java/controller/Controller.java | 11 ++++----- src/main/java/domain/Command.java | 5 ++++ src/main/java/repository/MapRepository.java | 26 +++++++++++++++++++-- src/main/java/repository/Repository.java | 2 +- src/main/java/service/Calculator.java | 3 ++- src/main/java/view/ConsoleInput.java | 2 +- src/main/java/view/ConsoleOutput.java | 6 +++-- src/main/java/view/Input.java | 3 ++- src/main/java/view/Output.java | 4 +++- 9 files changed, 47 insertions(+), 15 deletions(-) diff --git a/src/main/java/controller/Controller.java b/src/main/java/controller/Controller.java index 3353e9721..2df5ace41 100644 --- a/src/main/java/controller/Controller.java +++ b/src/main/java/controller/Controller.java @@ -31,18 +31,16 @@ public void run() { while(true) { consoleOutput.printMenu(); - // menu 객체로 만듦. menu = consoleInput.getMenuInput(); consoleInput.flushBuffer(); + switch (menu.getMenuNum()) { case SHOWMENU: - // showHistory input으로 Repository - // query 결과 넣어주면 될 듯. - consoleOutput.showHistory(); + consoleOutput.showHistory(mapRepository); break; case CALCULATEMENU: - command = new Command(consoleInput.getLine()); + command = new Command(consoleInput.getLineAndParse()); if(!command.isValidCommand()) { consoleOutput.printError(); break; @@ -50,10 +48,11 @@ public void run() { command.parseComamand(); result = calculator.calculate(command); System.out.println(result); + mapRepository.saveHistory(command.makeHistory(result)); break; case EXITMENU: consoleOutput.exitProgram(); - break; + return; default: consoleOutput.printError(); } diff --git a/src/main/java/domain/Command.java b/src/main/java/domain/Command.java index 5068bb95b..2288bbbf2 100644 --- a/src/main/java/domain/Command.java +++ b/src/main/java/domain/Command.java @@ -2,6 +2,8 @@ import main.java.service.Operator; +import java.util.Arrays; + public class Command { public String[] commandArr; @@ -17,6 +19,9 @@ public Command(String[] commandArr) { this.optArr = new Operator[optCount]; } + public String makeHistory(int result) { + return String.join(" ", this.commandArr) + " = " + result; + } public void parseComamand() { for(int i = 0; i < commandArr.length; i++) { if(i % 2 == 0) { diff --git a/src/main/java/repository/MapRepository.java b/src/main/java/repository/MapRepository.java index 9cd9a1b5c..f6799d001 100644 --- a/src/main/java/repository/MapRepository.java +++ b/src/main/java/repository/MapRepository.java @@ -1,9 +1,31 @@ package main.java.repository; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.Map; + +import static main.java.view.ConsoleOutput.EMPTY_MESSAGE; + public class MapRepository implements Repository { + + Map mapRepository; + public MapRepository() { + this.mapRepository = new LinkedHashMap<>(); + } + @Override - public void saveHistory() {}; + public void saveHistory(String history) { + this.mapRepository.put(1, history); + }; @Override - public void showHistory() {}; + public void showHistory() { + Iterator iter = mapRepository.values().iterator(); + if(!iter.hasNext()) + System.out.println(EMPTY_MESSAGE); + while(iter.hasNext()) { + System.out.println(iter.next()); + } + }; } diff --git a/src/main/java/repository/Repository.java b/src/main/java/repository/Repository.java index af65047e6..dc378f36f 100644 --- a/src/main/java/repository/Repository.java +++ b/src/main/java/repository/Repository.java @@ -1,6 +1,6 @@ package main.java.repository; public interface Repository { - void saveHistory(); + void saveHistory(String history); void showHistory(); } diff --git a/src/main/java/service/Calculator.java b/src/main/java/service/Calculator.java index 0dbdba84d..07a790033 100644 --- a/src/main/java/service/Calculator.java +++ b/src/main/java/service/Calculator.java @@ -14,13 +14,14 @@ public Calculator() {} public int calculate(Command command) { PM = Operator.PLUS; MD = Operator.MULTIPLY; + int result = 0; + int[] numberArr = command.numberArr; Operator[] optArr = command.optArr; Stack st = new Stack<>(); - // 처음의 수를 더해주기 위함. for(int i = 0; i < command.optCount; i++) { // nums stackPush(numberArr[i], st); diff --git a/src/main/java/view/ConsoleInput.java b/src/main/java/view/ConsoleInput.java index b4ef3acdc..3d45adf9a 100644 --- a/src/main/java/view/ConsoleInput.java +++ b/src/main/java/view/ConsoleInput.java @@ -23,7 +23,7 @@ public Menu getMenuInput() { } @Override - public String[] getLine() { + public String[] getLineAndParse() { return scanner.nextLine().split(DELIMINATOR); } public static void scannerClose() { diff --git a/src/main/java/view/ConsoleOutput.java b/src/main/java/view/ConsoleOutput.java index b2c87716c..a4472d4f9 100644 --- a/src/main/java/view/ConsoleOutput.java +++ b/src/main/java/view/ConsoleOutput.java @@ -1,6 +1,7 @@ package main.java.view; import main.java.domain.Menu; +import main.java.repository.Repository; import static main.java.view.ConsoleInput.ERROR_MESSAGE; import static main.java.view.ConsoleInput.scannerClose; @@ -8,6 +9,7 @@ public class ConsoleOutput implements Output{ private static final String EXIT_MESSAGE = "EXIT CALCULATOR PROGRAM"; + public static final String EMPTY_MESSAGE = "This repository is EMPTY!!"; // 자원정리의 주체가 output이 돼도 되나? @Override @@ -17,8 +19,8 @@ public void exitProgram() { } @Override - public void showHistory() { - + public void showHistory(Repository repository) { + repository.showHistory(); } public void printError() { diff --git a/src/main/java/view/Input.java b/src/main/java/view/Input.java index 0720d85dd..6ee9b97af 100644 --- a/src/main/java/view/Input.java +++ b/src/main/java/view/Input.java @@ -4,5 +4,6 @@ public interface Input { Menu getMenuInput(); - String[] getLine(); + + String[] getLineAndParse(); } diff --git a/src/main/java/view/Output.java b/src/main/java/view/Output.java index b2246411b..dacb1b9e4 100644 --- a/src/main/java/view/Output.java +++ b/src/main/java/view/Output.java @@ -1,7 +1,9 @@ package main.java.view; +import main.java.repository.Repository; + public interface Output { void exitProgram(); - void showHistory(); + void showHistory(Repository repository); void printMenu(); } From da1c49f0697c09caeca8de44f07325081b98c9ad Mon Sep 17 00:00:00 2001 From: BeommoKoo Date: Fri, 9 Jun 2023 00:10:08 +0900 Subject: [PATCH 12/16] added .gradle to .gitignore --- .gitignore | 1 + build.gradle | 1 + src/main/java/controller/Controller.java | 71 ++++++++++--------- src/main/java/domain/Command.java | 33 +-------- src/main/java/domain/Menu.java | 5 +- .../java/exception/OutOfMenuException.java | 8 +++ .../java/exception/WrongCommandException.java | 8 +++ src/main/java/repository/MapRepository.java | 10 +-- src/main/java/repository/Memorizer.java | 24 ------- src/main/java/service/Operator.java | 1 - src/main/java/util/PrintOutMessage.java | 8 +++ src/main/java/view/ConsoleInput.java | 26 +++++-- src/main/java/view/ConsoleOutput.java | 21 +++--- src/main/java/view/Output.java | 1 + src/test/CalculatorTest.java | 23 +++--- src/test/CommanderTest.java | 29 -------- 16 files changed, 120 insertions(+), 150 deletions(-) create mode 100644 src/main/java/exception/OutOfMenuException.java create mode 100644 src/main/java/exception/WrongCommandException.java delete mode 100644 src/main/java/repository/Memorizer.java create mode 100644 src/main/java/util/PrintOutMessage.java delete mode 100644 src/test/CommanderTest.java diff --git a/.gitignore b/.gitignore index 189a135f0..9df9034ad 100644 --- a/.gitignore +++ b/.gitignore @@ -201,6 +201,7 @@ gradle-app.setting *.hprof .idea +.gradle # End of https://www.toptal.com/developers/gitignore/api/java,macos,intellij,gradle diff --git a/build.gradle b/build.gradle index 87827ea4e..22bad42ac 100644 --- a/build.gradle +++ b/build.gradle @@ -18,6 +18,7 @@ sourceSets { dependencies { implementation 'org.junit.jupiter:junit-jupiter:5.9.1' testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.4.2' } tasks.named('test') { diff --git a/src/main/java/controller/Controller.java b/src/main/java/controller/Controller.java index 2df5ace41..45a2a3a94 100644 --- a/src/main/java/controller/Controller.java +++ b/src/main/java/controller/Controller.java @@ -2,26 +2,31 @@ import main.java.domain.Command; import main.java.domain.Menu; +import main.java.exception.OutOfMenuException; +import main.java.exception.WrongCommandException; import main.java.repository.MapRepository; +import main.java.repository.Repository; import main.java.service.Calculator; import main.java.view.ConsoleInput; import main.java.view.ConsoleOutput; +import main.java.view.Input; +import main.java.view.Output; import static main.java.view.ConsoleInput.*; public class Controller { - ConsoleInput consoleInput; - ConsoleOutput consoleOutput; - Calculator calculator; - MapRepository mapRepository; + private Input input; + private Output output; + private Calculator calculator; + private Repository repository; - public Controller(ConsoleInput consoleInput, ConsoleOutput consoleOutput, Calculator calculator, MapRepository mapRepository) { - this.consoleInput = consoleInput; - this.consoleOutput = consoleOutput; + public Controller(Input input, Output output, Calculator calculator, Repository repository) { + this.input = input; + this.output = output; this.calculator = calculator; - this.mapRepository = mapRepository; + this.repository = repository; } public void run() { @@ -30,32 +35,34 @@ public void run() { int result; while(true) { - consoleOutput.printMenu(); - // menu 객체로 만듦. - menu = consoleInput.getMenuInput(); - consoleInput.flushBuffer(); - - switch (menu.getMenuNum()) { - case SHOWMENU: - consoleOutput.showHistory(mapRepository); - break; - case CALCULATEMENU: - command = new Command(consoleInput.getLineAndParse()); - if(!command.isValidCommand()) { - consoleOutput.printError(); + try { + output.printMenu(); + // menu 객체로 만듦. + menu = input.getMenuInput(); + + switch (menu.getMenuNum()) { + case SHOWMENU: + output.showHistory(repository); + break; + + case CALCULATEMENU: + command = new Command(input.getLineAndParse()); + command.parseComamand(); + result = calculator.calculate(command); + output.printResult(result); + repository.saveHistory(command.makeHistory(result)); break; - } - command.parseComamand(); - result = calculator.calculate(command); - System.out.println(result); - mapRepository.saveHistory(command.makeHistory(result)); - break; - case EXITMENU: - consoleOutput.exitProgram(); - return; - default: - consoleOutput.printError(); + + case EXITMENU: + output.exitProgram(); + return; + } + } catch (WrongCommandException e) { + e.printStackTrace(); + } catch (OutOfMenuException e) { + e.printStackTrace(); } + } } diff --git a/src/main/java/domain/Command.java b/src/main/java/domain/Command.java index 2288bbbf2..aeace80a9 100644 --- a/src/main/java/domain/Command.java +++ b/src/main/java/domain/Command.java @@ -2,14 +2,11 @@ import main.java.service.Operator; -import java.util.Arrays; - public class Command { public String[] commandArr; public int[] numberArr; public Operator[] optArr; - public String calculateResult; public int optCount; public Command(String[] commandArr) { @@ -22,6 +19,7 @@ public Command(String[] commandArr) { public String makeHistory(int result) { return String.join(" ", this.commandArr) + " = " + result; } + public void parseComamand() { for(int i = 0; i < commandArr.length; i++) { if(i % 2 == 0) { @@ -32,33 +30,4 @@ public void parseComamand() { } } - public boolean isValidCommand() { - if((isValidNumber() && isValidOperator()) == true) - return true; - return false; - } - - private boolean isStringDigit(String Number) { - for (int i = 0; i < Number.length(); i++) { - if (!Character.isDigit(Number.charAt(i))) { - return false; - } - } - return true; - } - - private boolean isValidNumber() { - for(int i = 0; i < this.commandArr.length; i += 2) - if(!isStringDigit(this.commandArr[i])) - return false; - return true; - } - - private boolean isValidOperator() { - for(int i = 1; i < this.commandArr.length; i += 2) { - if(!Operator.isValidOperator(this.commandArr[i])) - return false; - } - return true; - } } diff --git a/src/main/java/domain/Menu.java b/src/main/java/domain/Menu.java index 3322498c1..969c897e1 100644 --- a/src/main/java/domain/Menu.java +++ b/src/main/java/domain/Menu.java @@ -4,13 +4,14 @@ // 메뉴도 하나의 Data 단위. public enum Menu { + SELECT(-1, "선택 : "), EXIT(0, "종료"), SHOW(1, "조회"), - CALCULATE(2, "계산"), - SELECT(0, "선택 : "); + CALCULATE(2, "계산"); private final int menuNum; private final String menuName; + public static int menuCount = 3; Menu(int menuNum, String menuName) { this.menuNum = menuNum; diff --git a/src/main/java/exception/OutOfMenuException.java b/src/main/java/exception/OutOfMenuException.java new file mode 100644 index 000000000..ac8f062b8 --- /dev/null +++ b/src/main/java/exception/OutOfMenuException.java @@ -0,0 +1,8 @@ +package main.java.exception; + +public class OutOfMenuException extends RuntimeException{ + + public OutOfMenuException(String message) { + super(message); + } +} diff --git a/src/main/java/exception/WrongCommandException.java b/src/main/java/exception/WrongCommandException.java new file mode 100644 index 000000000..72a5e9161 --- /dev/null +++ b/src/main/java/exception/WrongCommandException.java @@ -0,0 +1,8 @@ +package main.java.exception; + +public class WrongCommandException extends RuntimeException{ + + public WrongCommandException(String message) { + super(message); + } +} diff --git a/src/main/java/repository/MapRepository.java b/src/main/java/repository/MapRepository.java index f6799d001..e7c7fa45a 100644 --- a/src/main/java/repository/MapRepository.java +++ b/src/main/java/repository/MapRepository.java @@ -1,22 +1,24 @@ package main.java.repository; -import java.util.Hashtable; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; -import static main.java.view.ConsoleOutput.EMPTY_MESSAGE; +import static main.java.util.PrintOutMessage.EMPTY_MESSAGE; public class MapRepository implements Repository { + int historyCount; Map mapRepository; public MapRepository() { this.mapRepository = new LinkedHashMap<>(); + this.historyCount = 0; } @Override public void saveHistory(String history) { - this.mapRepository.put(1, history); + this.mapRepository.put(historyCount, history); + historyCount++; }; @Override @@ -27,5 +29,5 @@ public void showHistory() { while(iter.hasNext()) { System.out.println(iter.next()); } - }; + } } diff --git a/src/main/java/repository/Memorizer.java b/src/main/java/repository/Memorizer.java deleted file mode 100644 index 1500443f2..000000000 --- a/src/main/java/repository/Memorizer.java +++ /dev/null @@ -1,24 +0,0 @@ -package main.java.repository; - -import java.util.LinkedList; -import java.util.Queue; - -public class Memorizer { - - private static Memorizer memorizer = new Memorizer(); - - private Queue history; - private Memorizer() { - this.history = new LinkedList<>(); - } - - public static Memorizer getInstance() { - return memorizer; - } - - public void save(String result) { - history.add(result); - } - - -} diff --git a/src/main/java/service/Operator.java b/src/main/java/service/Operator.java index dcdf49734..66731d770 100644 --- a/src/main/java/service/Operator.java +++ b/src/main/java/service/Operator.java @@ -13,7 +13,6 @@ public enum Operator { public final String optName; private final BiFunction biFunction; - private Operator status; Operator(String optName, BiFunction biFunction) { this.optName = optName; diff --git a/src/main/java/util/PrintOutMessage.java b/src/main/java/util/PrintOutMessage.java new file mode 100644 index 000000000..a529e6bad --- /dev/null +++ b/src/main/java/util/PrintOutMessage.java @@ -0,0 +1,8 @@ +package main.java.util; + +public class PrintOutMessage { + + public static final String EXIT_MESSAGE = "EXIT calculate .."; + public static final String EMPTY_MESSAGE = "Repository is EMPTY!!"; + +} diff --git a/src/main/java/view/ConsoleInput.java b/src/main/java/view/ConsoleInput.java index 3d45adf9a..2f977e8dd 100644 --- a/src/main/java/view/ConsoleInput.java +++ b/src/main/java/view/ConsoleInput.java @@ -1,35 +1,48 @@ package main.java.view; import main.java.domain.Menu; +import main.java.exception.OutOfMenuException; +import main.java.exception.WrongCommandException; import java.util.Scanner; import static main.java.domain.Menu.getMenu; import static main.java.service.Operator.isValidOperator; +import static main.java.view.ConsoleOutput.printError; public class ConsoleInput implements Input{ private static final Scanner scanner = new Scanner(System.in); - public static final String ERROR_MESSAGE = "Unavailable Input !! Please re-type!!"; private static final String DELIMINATOR = " "; public static final int SHOWMENU = 1; public static final int CALCULATEMENU = 2; public static final int EXITMENU = 0; @Override - public Menu getMenuInput() { - return getMenu(scanner.nextInt()); + public Menu getMenuInput() throws OutOfMenuException { + String line = scanner.nextLine(); + String[] lineArr = line.split(DELIMINATOR); + String menuCandidate = lineArr[0]; + if (lineArr.length >= 2 || !checkIsNumber(menuCandidate) + || Character.getNumericValue(menuCandidate.charAt(0)) >= Menu.menuCount + || Character.getNumericValue(menuCandidate.charAt(0)) < 0) { + throw new OutOfMenuException(printError("MENU")); + } + return getMenu(Integer.parseInt(menuCandidate)); } @Override - public String[] getLineAndParse() { - return scanner.nextLine().split(DELIMINATOR); + public String[] getLineAndParse() throws WrongCommandException { + String[] commandArr = scanner.nextLine().split(DELIMINATOR); + if(!isValidCommand(commandArr)) + throw new WrongCommandException(printError("COMMAND")); + return commandArr; } public static void scannerClose() { scanner.close(); } - public void flushBuffer() { + public static void flushBuffer() { scanner.nextLine(); } @@ -60,5 +73,4 @@ private static boolean checkIsNumber(String commandEntity) { return true; } - } diff --git a/src/main/java/view/ConsoleOutput.java b/src/main/java/view/ConsoleOutput.java index a4472d4f9..736ebc172 100644 --- a/src/main/java/view/ConsoleOutput.java +++ b/src/main/java/view/ConsoleOutput.java @@ -3,13 +3,14 @@ import main.java.domain.Menu; import main.java.repository.Repository; -import static main.java.view.ConsoleInput.ERROR_MESSAGE; +import static main.java.util.PrintOutMessage.EXIT_MESSAGE; import static main.java.view.ConsoleInput.scannerClose; public class ConsoleOutput implements Output{ - private static final String EXIT_MESSAGE = "EXIT CALCULATOR PROGRAM"; - public static final String EMPTY_MESSAGE = "This repository is EMPTY!!"; + public static String printError(String error) { + return "WRONG " + error + " ! PLEASE RE-TYPE!!"; + } // 자원정리의 주체가 output이 돼도 되나? @Override @@ -19,19 +20,21 @@ public void exitProgram() { } @Override - public void showHistory(Repository repository) { - repository.showHistory(); + public void printResult(int result) { + System.out.println(result); } - public void printError() { - System.out.println(ERROR_MESSAGE); + // 다형성 이용. + @Override + public void showHistory(Repository repository) { + repository.showHistory(); } @Override public void printMenu() { Menu[] menus = Menu.values(); - for(int i = 0; i < menus.length - 1; i++) + for(int i = 1; i < menus.length; i++) System.out.println(menus[i]); - System.out.println(menus[menus.length - 1].getMenuName()); + System.out.println(menus[0].getMenuName()); } } diff --git a/src/main/java/view/Output.java b/src/main/java/view/Output.java index dacb1b9e4..96d7d83b5 100644 --- a/src/main/java/view/Output.java +++ b/src/main/java/view/Output.java @@ -6,4 +6,5 @@ public interface Output { void exitProgram(); void showHistory(Repository repository); void printMenu(); + void printResult(int result); } diff --git a/src/test/CalculatorTest.java b/src/test/CalculatorTest.java index be3c9fdf0..f40a93d0b 100644 --- a/src/test/CalculatorTest.java +++ b/src/test/CalculatorTest.java @@ -2,6 +2,8 @@ import main.java.service.Calculator; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -10,23 +12,24 @@ class CalculatorTest { String command; Calculator calculator = new Calculator(); @DisplayName("calculate함수는 띄어쓰기로 파싱된 commandArr를 계산하는 함수.") - @Test - void calculateTest() { + @ParameterizedTest + @ValueSource(strings = {"5 * 2 + 64 / 32 - 7", + "15 / 5 * 2 + 8 / 2", + "2 + 12 / 6 - 3 * 7", + "7 - 25 * 3 + 20 / 10"}) + + void calculateTest(String command) { // 1. * + / - - command = "5 * 2 + 64 / 32 - 7"; assertEquals(5, input(command)); // 2. / * + / - command = "15 / 5 * 2 + 8 / 2"; - assertEquals(10, input(command)); +// assertEquals(10, input(command)); - // 3. + / - * - command = "2 + 12 / 6 - 3 * 7"; - assertEquals(-17, input(command)); + // 3. + / - * +// assertEquals(-17, input(command)); // 4. - * + / - command = "7 - 25 * 3 + 20 / 10"; - assertEquals(-66, input(command)); +// assertEquals(-66, input(command)); } int input(String command) { diff --git a/src/test/CommanderTest.java b/src/test/CommanderTest.java deleted file mode 100644 index aa7805c34..000000000 --- a/src/test/CommanderTest.java +++ /dev/null @@ -1,29 +0,0 @@ -//import org.junit.jupiter.api.DisplayName; -//import org.junit.jupiter.api.Test; -// -//import static org.junit.jupiter.api.Assertions.*; -// -//public class CommanderTest { -// -// String command; -// String[] commandArr; -// -// @DisplayName("isDigit함수는 input으로 들어온 String의 첫번째 문자를 검사하여 숫자인지, String인지(첫번째 문자가 char면 String) 판단한다.") -// @Test -// void isDigitTest() { -// assertTrue(Commander.isDigit("123")); -// assertFalse(Commander.isDigit("#")); -// assertFalse(Commander.isDigit("+")); -// } -// -// @DisplayName("check함수는 input 형식에 맞게, 숫자 연산자 숫자 연산자 가 번갈아 나오는지, 숫자라면 중간에 문자가 껴있는지 체크하고, 연산자라면 사칙연산의 연산자인지 체크한다.") -// @Test -// void checkTest() { -// command = "1 & 2"; -// commandArr = command.split(" "); -// assertEquals(false, Commander.check(commandArr)); -// command = "1 + 3"; -// commandArr = command.split(" "); -// assertEquals(true, Commander.check(commandArr)); -// } -//} From 7511b58968d87fe6496b3c6f3ca60e26e3887ec7 Mon Sep 17 00:00:00 2001 From: BeommoKoo Date: Fri, 9 Jun 2023 15:40:14 +0900 Subject: [PATCH 13/16] done --- src/main/java/controller/Controller.java | 11 ++--- src/main/java/domain/Command.java | 2 + .../java/exception/OutOfMenuException.java | 8 ---- .../java/exception/WrongCommandException.java | 8 ---- src/main/java/view/ConsoleInput.java | 25 ++++------ src/test/CalculatorTest.java | 47 +++++++------------ src/test/CommandTest.java | 47 +++++++++++++++++++ 7 files changed, 80 insertions(+), 68 deletions(-) delete mode 100644 src/main/java/exception/OutOfMenuException.java delete mode 100644 src/main/java/exception/WrongCommandException.java create mode 100644 src/test/CommandTest.java diff --git a/src/main/java/controller/Controller.java b/src/main/java/controller/Controller.java index 45a2a3a94..9c9d4a53f 100644 --- a/src/main/java/controller/Controller.java +++ b/src/main/java/controller/Controller.java @@ -2,13 +2,8 @@ import main.java.domain.Command; import main.java.domain.Menu; -import main.java.exception.OutOfMenuException; -import main.java.exception.WrongCommandException; -import main.java.repository.MapRepository; import main.java.repository.Repository; import main.java.service.Calculator; -import main.java.view.ConsoleInput; -import main.java.view.ConsoleOutput; import main.java.view.Input; import main.java.view.Output; @@ -47,7 +42,7 @@ public void run() { case CALCULATEMENU: command = new Command(input.getLineAndParse()); - command.parseComamand(); +// command.parseComamand(); result = calculator.calculate(command); output.printResult(result); repository.saveHistory(command.makeHistory(result)); @@ -57,9 +52,9 @@ public void run() { output.exitProgram(); return; } - } catch (WrongCommandException e) { + } catch (IllegalArgumentException e) { e.printStackTrace(); - } catch (OutOfMenuException e) { + } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/domain/Command.java b/src/main/java/domain/Command.java index aeace80a9..74af2581a 100644 --- a/src/main/java/domain/Command.java +++ b/src/main/java/domain/Command.java @@ -14,6 +14,8 @@ public Command(String[] commandArr) { this.optCount = commandArr.length / 2; this.numberArr = new int[optCount + 1]; this.optArr = new Operator[optCount]; + + parseComamand(); } public String makeHistory(int result) { diff --git a/src/main/java/exception/OutOfMenuException.java b/src/main/java/exception/OutOfMenuException.java deleted file mode 100644 index ac8f062b8..000000000 --- a/src/main/java/exception/OutOfMenuException.java +++ /dev/null @@ -1,8 +0,0 @@ -package main.java.exception; - -public class OutOfMenuException extends RuntimeException{ - - public OutOfMenuException(String message) { - super(message); - } -} diff --git a/src/main/java/exception/WrongCommandException.java b/src/main/java/exception/WrongCommandException.java deleted file mode 100644 index 72a5e9161..000000000 --- a/src/main/java/exception/WrongCommandException.java +++ /dev/null @@ -1,8 +0,0 @@ -package main.java.exception; - -public class WrongCommandException extends RuntimeException{ - - public WrongCommandException(String message) { - super(message); - } -} diff --git a/src/main/java/view/ConsoleInput.java b/src/main/java/view/ConsoleInput.java index 2f977e8dd..bf236f359 100644 --- a/src/main/java/view/ConsoleInput.java +++ b/src/main/java/view/ConsoleInput.java @@ -1,8 +1,7 @@ package main.java.view; import main.java.domain.Menu; -import main.java.exception.OutOfMenuException; -import main.java.exception.WrongCommandException; +import org.junit.jupiter.api.Test; import java.util.Scanner; @@ -19,33 +18,29 @@ public class ConsoleInput implements Input{ public static final int CALCULATEMENU = 2; public static final int EXITMENU = 0; - @Override - public Menu getMenuInput() throws OutOfMenuException { + @Test + public Menu getMenuInput() throws IllegalArgumentException { String line = scanner.nextLine(); String[] lineArr = line.split(DELIMINATOR); String menuCandidate = lineArr[0]; - if (lineArr.length >= 2 || !checkIsNumber(menuCandidate) + if (lineArr.length >= 2 || !isValidNumber(menuCandidate) || Character.getNumericValue(menuCandidate.charAt(0)) >= Menu.menuCount || Character.getNumericValue(menuCandidate.charAt(0)) < 0) { - throw new OutOfMenuException(printError("MENU")); + throw new IllegalArgumentException(printError("MENU")); } return getMenu(Integer.parseInt(menuCandidate)); } - @Override - public String[] getLineAndParse() throws WrongCommandException { + @Test + public String[] getLineAndParse() throws IllegalArgumentException { String[] commandArr = scanner.nextLine().split(DELIMINATOR); if(!isValidCommand(commandArr)) - throw new WrongCommandException(printError("COMMAND")); + throw new IllegalArgumentException(printError("COMMAND")); return commandArr; } public static void scannerClose() { scanner.close(); } - public static void flushBuffer() { - scanner.nextLine(); - } - // 각각 숫자 , 연산자에 대해 맞는 command인지 검사. public boolean isValidCommand(String[] commandArr) { @@ -53,7 +48,7 @@ public boolean isValidCommand(String[] commandArr) { for(int i = 0; i < commandArr.length; i++) { commandEntity = commandArr[i]; if(i % 2 == 0) { - if(!checkIsNumber(commandEntity)) + if(!isValidNumber(commandEntity)) return false; } else { @@ -64,7 +59,7 @@ public boolean isValidCommand(String[] commandArr) { return true; } - private static boolean checkIsNumber(String commandEntity) { + private static boolean isValidNumber(String commandEntity) { for(int i = 0; i < commandEntity.length(); i++) { if(!Character.isDigit(commandEntity.charAt(i))) return false; diff --git a/src/test/CalculatorTest.java b/src/test/CalculatorTest.java index f40a93d0b..6ac6f327f 100644 --- a/src/test/CalculatorTest.java +++ b/src/test/CalculatorTest.java @@ -1,41 +1,30 @@ import main.java.domain.Command; import main.java.service.Calculator; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.ValueSource; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; import static org.junit.jupiter.api.Assertions.assertEquals; class CalculatorTest { - String command; - Calculator calculator = new Calculator(); - @DisplayName("calculate함수는 띄어쓰기로 파싱된 commandArr를 계산하는 함수.") - @ParameterizedTest - @ValueSource(strings = {"5 * 2 + 64 / 32 - 7", - "15 / 5 * 2 + 8 / 2", - "2 + 12 / 6 - 3 * 7", - "7 - 25 * 3 + 20 / 10"}) - - void calculateTest(String command) { - // 1. * + / - - assertEquals(5, input(command)); - - // 2. / * + / -// assertEquals(10, input(command)); - - // 3. + / - * -// assertEquals(-17, input(command)); - - // 4. - * + / -// assertEquals(-66, input(command)); + static Calculator calculator; + @BeforeAll + public static void setting() { + calculator = new Calculator(); } - int input(String command) { - String[] commandArr = command.split(" "); - Command command1 = new Command(commandArr); - command1.parseComamand(); - return calculator.calculate(command1); + @DisplayName("calculate함수는 띄어쓰기로 파싱된 input을 계산하는 함수.") + @ParameterizedTest + @CsvSource({"5 * 2 + 64 / 32 - 7, 5", + "15 / 5 * 2 + 8 / 2, 10", + "2 + 12 / 6 - 3 * 7, -17", + "7 - 25 * 3 + 20 / 10, -66" + }) + // Test는 하나의 시나리오에 대해서만 검증하도록. + void calculateTest(String input, int expected) { + Command command = new Command(input.split(" ")); + assertEquals(expected, calculator.calculate(command)); } } diff --git a/src/test/CommandTest.java b/src/test/CommandTest.java new file mode 100644 index 000000000..c9a1a1aa0 --- /dev/null +++ b/src/test/CommandTest.java @@ -0,0 +1,47 @@ +import main.java.domain.Command; +import main.java.service.Calculator; +import main.java.service.Operator; + +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class CommandTest { + + static Command command; + static int[] compNumArr; + static Operator[] compOptArr; + static Calculator calculator; + + @BeforeAll + public static void setting() { + command = new Command(stringToArray("1 + 2 + 3")); + compNumArr = new int[] {1, 2, 3}; + compOptArr = new Operator[] {Operator.PLUS, Operator.PLUS}; + calculator = new Calculator(); + } + + @DisplayName("parseCommand는 인자로 들어온 String array를" + + "각각 정수와 연산자로 나눠주는 함수" + + "Command생성할때 이미 parsing완료한다.") + @Test + public void parseCommandTest() { + assertArrayEquals(compOptArr, command.optArr); + assertArrayEquals(compNumArr, command.numberArr); + } + + @DisplayName("makeHistory는 인자로 들어온 result와 " + + "연산에 이용한 command를 합쳐서 String으로 리턴하는 함수") + @Test + public void makeHistoryTest() { + String expectedHistory = "1 + 2 + 3 = 6"; + assertEquals(expectedHistory, command.makeHistory(calculator.calculate(command))); + } + + public static String[] stringToArray(String input) { + return input.split(" "); + } +} From 7b75557a510494ce9f2840f36531dc9d9d684e21 Mon Sep 17 00:00:00 2001 From: BeommoKoo Date: Wed, 14 Jun 2023 17:41:48 +0900 Subject: [PATCH 14/16] refactoring end --- src/main/java/controller/Controller.java | 35 ++++++++++--------- src/main/java/domain/Command.java | 24 +++++++++---- src/main/java/domain/History.java | 13 +++++++ src/main/java/domain/Menu.java | 2 +- .../java/repository/HistoryRepository.java | 10 ++++++ src/main/java/repository/MapRepository.java | 23 +++++------- src/main/java/repository/Repository.java | 6 ---- src/main/java/service/Calculator.java | 34 +++++++++--------- src/main/java/service/Operator.java | 12 ++++--- src/main/java/util/PrintOutMessage.java | 8 ----- src/main/java/view/ConsoleInput.java | 11 +++--- src/main/java/view/ConsoleOutput.java | 27 ++++++++------ src/main/java/view/Output.java | 12 +++++-- src/test/CommandTest.java | 19 +++++----- src/test/MenuTest.java | 12 +++++++ 15 files changed, 145 insertions(+), 103 deletions(-) create mode 100644 src/main/java/domain/History.java create mode 100644 src/main/java/repository/HistoryRepository.java delete mode 100644 src/main/java/repository/Repository.java delete mode 100644 src/main/java/util/PrintOutMessage.java create mode 100644 src/test/MenuTest.java diff --git a/src/main/java/controller/Controller.java b/src/main/java/controller/Controller.java index 9c9d4a53f..cb71d7088 100644 --- a/src/main/java/controller/Controller.java +++ b/src/main/java/controller/Controller.java @@ -1,8 +1,9 @@ package main.java.controller; import main.java.domain.Command; +import main.java.domain.History; import main.java.domain.Menu; -import main.java.repository.Repository; +import main.java.repository.HistoryRepository; import main.java.service.Calculator; import main.java.view.Input; import main.java.view.Output; @@ -12,12 +13,12 @@ public class Controller { - private Input input; - private Output output; - private Calculator calculator; - private Repository repository; + private final Input input; + private final Output output; + private final Calculator calculator; + private final HistoryRepository repository; - public Controller(Input input, Output output, Calculator calculator, Repository repository) { + public Controller(Input input, Output output, Calculator calculator, HistoryRepository repository) { this.input = input; this.output = output; this.calculator = calculator; @@ -25,31 +26,31 @@ public Controller(Input input, Output output, Calculator calculator, Repository } public void run() { - Menu menu; - Command command; - int result; while(true) { try { - output.printMenu(); + output.printMenu(Menu.values()); // menu 객체로 만듦. - menu = input.getMenuInput(); + Menu menu = input.getMenuInput(); switch (menu.getMenuNum()) { case SHOWMENU: - output.showHistory(repository); + output.showHistory(repository.getAllHistoryToList()); break; case CALCULATEMENU: - command = new Command(input.getLineAndParse()); -// command.parseComamand(); - result = calculator.calculate(command); + Command command = new Command(input.getLineAndParse()); + int result = calculator.calculate(command); + + // output에서 DTO output.printResult(result); - repository.saveHistory(command.makeHistory(result)); + History history = new History(command.getCommandArr(), result); + repository.saveHistory(history); break; case EXITMENU: output.exitProgram(); + scannerClose(); return; } } catch (IllegalArgumentException e) { @@ -57,8 +58,8 @@ public void run() { } catch (Exception e) { e.printStackTrace(); } - } + } } diff --git a/src/main/java/domain/Command.java b/src/main/java/domain/Command.java index 74af2581a..fe0bb4ad3 100644 --- a/src/main/java/domain/Command.java +++ b/src/main/java/domain/Command.java @@ -4,10 +4,10 @@ public class Command { - public String[] commandArr; - public int[] numberArr; - public Operator[] optArr; - public int optCount; + private String[] commandArr; + private int[] numberArr; + private Operator[] optArr; + private int optCount; public Command(String[] commandArr) { this.commandArr = commandArr; @@ -18,8 +18,20 @@ public Command(String[] commandArr) { parseComamand(); } - public String makeHistory(int result) { - return String.join(" ", this.commandArr) + " = " + result; + public String[] getCommandArr() { + return commandArr; + } + + public int[] getNumberArr() { + return numberArr; + } + + public Operator[] getOptArr() { + return optArr; + } + + public int getOptCount() { + return optCount; } public void parseComamand() { diff --git a/src/main/java/domain/History.java b/src/main/java/domain/History.java new file mode 100644 index 000000000..875618458 --- /dev/null +++ b/src/main/java/domain/History.java @@ -0,0 +1,13 @@ +package main.java.domain; + +public class History { + private String history; + + public History(String[] commandArr, int result) { + this.history = String.join(" ", commandArr) + " = " + result; + } + + public String getHistory() { + return history; + } +} diff --git a/src/main/java/domain/Menu.java b/src/main/java/domain/Menu.java index 969c897e1..5748d49bd 100644 --- a/src/main/java/domain/Menu.java +++ b/src/main/java/domain/Menu.java @@ -11,7 +11,7 @@ public enum Menu { private final int menuNum; private final String menuName; - public static int menuCount = 3; + public static final int menuCount = Menu.values().length - 1; Menu(int menuNum, String menuName) { this.menuNum = menuNum; diff --git a/src/main/java/repository/HistoryRepository.java b/src/main/java/repository/HistoryRepository.java new file mode 100644 index 000000000..d1e474d8f --- /dev/null +++ b/src/main/java/repository/HistoryRepository.java @@ -0,0 +1,10 @@ +package main.java.repository; + +import main.java.domain.History; + +import java.util.List; + +public interface HistoryRepository { + void saveHistory(History history); + List getAllHistoryToList(); +} diff --git a/src/main/java/repository/MapRepository.java b/src/main/java/repository/MapRepository.java index e7c7fa45a..e7f390248 100644 --- a/src/main/java/repository/MapRepository.java +++ b/src/main/java/repository/MapRepository.java @@ -1,33 +1,26 @@ package main.java.repository; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.Map; +import main.java.domain.History; -import static main.java.util.PrintOutMessage.EMPTY_MESSAGE; +import java.util.*; -public class MapRepository implements Repository { +public class MapRepository implements HistoryRepository { - int historyCount; - Map mapRepository; + private int historyCount; + private Map mapRepository; public MapRepository() { this.mapRepository = new LinkedHashMap<>(); this.historyCount = 0; } @Override - public void saveHistory(String history) { + public void saveHistory(History history) { this.mapRepository.put(historyCount, history); historyCount++; }; @Override - public void showHistory() { - Iterator iter = mapRepository.values().iterator(); - if(!iter.hasNext()) - System.out.println(EMPTY_MESSAGE); - while(iter.hasNext()) { - System.out.println(iter.next()); - } + public List getAllHistoryToList() { + return new ArrayList<>(mapRepository.values()); } } diff --git a/src/main/java/repository/Repository.java b/src/main/java/repository/Repository.java deleted file mode 100644 index dc378f36f..000000000 --- a/src/main/java/repository/Repository.java +++ /dev/null @@ -1,6 +0,0 @@ -package main.java.repository; - -public interface Repository { - void saveHistory(String history); - void showHistory(); -} diff --git a/src/main/java/service/Calculator.java b/src/main/java/service/Calculator.java index 07a790033..93fb9607e 100644 --- a/src/main/java/service/Calculator.java +++ b/src/main/java/service/Calculator.java @@ -6,8 +6,8 @@ public class Calculator { - Operator PM; - Operator MD; + private Operator PM; + private Operator MD; public Calculator() {} @@ -17,38 +17,38 @@ public int calculate(Command command) { int result = 0; - int[] numberArr = command.numberArr; - Operator[] optArr = command.optArr; + int[] numberArr = command.getNumberArr(); + Operator[] optArr = command.getOptArr(); - Stack st = new Stack<>(); + Stack stack = new Stack<>(); - for(int i = 0; i < command.optCount; i++) { + for(int i = 0; i < command.getOptCount(); i++) { // nums - stackPush(numberArr[i], st); + stackPush(numberArr[i], stack); // opts if(optArr[i].decideToCalculate()) { - result = PM.calculateOpt(result, st.peek()); + result = PM.calculateOpt(result, stack.peek()); PM = optArr[i]; - st.pop(); + stack.pop(); continue; } MD = optArr[i]; } - stackPush(numberArr[command.optCount], st); + stackPush(numberArr[command.getOptCount()], stack); // 마지막 command의 숫자까지 처리. - result = PM.calculateOpt(result, st.peek()); + result = PM.calculateOpt(result, stack.peek()); return result; } - private void stackPush(int number, Stack st) { - if(st.isEmpty()) { - st.push(number); + private void stackPush(int number, Stack stack) { + if(stack.isEmpty()) { + stack.push(number); return; } - int top = st.peek(); - st.pop(); - st.push(MD.calculateOpt(top, number)); + int top = stack.peek(); + stack.pop(); + stack.push(MD.calculateOpt(top, number)); } } diff --git a/src/main/java/service/Operator.java b/src/main/java/service/Operator.java index 66731d770..afdfbc73e 100644 --- a/src/main/java/service/Operator.java +++ b/src/main/java/service/Operator.java @@ -4,6 +4,7 @@ import java.util.Iterator; import java.util.List; import java.util.function.BiFunction; +import java.util.stream.Collectors; public enum Operator { PLUS("+", (a, b) -> (a + b)), @@ -19,6 +20,10 @@ public enum Operator { this.biFunction = biFunction; } + public String getOptName() { + return optName; + } + public boolean decideToCalculate() { if(this == PLUS || this == MINUS) return true; @@ -31,10 +36,9 @@ public Integer calculateOpt(Integer a, Integer b) { // for checking valid operator input. private static List toStringArray(Operator[] operators) { - String[] optNames = new String[operators.length]; - for(int i = 0; i < operators.length; i++) - optNames[i] = operators[i].optName; - return Arrays.asList(optNames); + return Arrays.stream(operators) + .map(Operator::getOptName) + .collect(Collectors.toList()); } public static boolean isValidOperator(String comp) { diff --git a/src/main/java/util/PrintOutMessage.java b/src/main/java/util/PrintOutMessage.java deleted file mode 100644 index a529e6bad..000000000 --- a/src/main/java/util/PrintOutMessage.java +++ /dev/null @@ -1,8 +0,0 @@ -package main.java.util; - -public class PrintOutMessage { - - public static final String EXIT_MESSAGE = "EXIT calculate .."; - public static final String EMPTY_MESSAGE = "Repository is EMPTY!!"; - -} diff --git a/src/main/java/view/ConsoleInput.java b/src/main/java/view/ConsoleInput.java index bf236f359..71629053c 100644 --- a/src/main/java/view/ConsoleInput.java +++ b/src/main/java/view/ConsoleInput.java @@ -18,26 +18,25 @@ public class ConsoleInput implements Input{ public static final int CALCULATEMENU = 2; public static final int EXITMENU = 0; - @Test - public Menu getMenuInput() throws IllegalArgumentException { + public Menu getMenuInput() { String line = scanner.nextLine(); String[] lineArr = line.split(DELIMINATOR); String menuCandidate = lineArr[0]; if (lineArr.length >= 2 || !isValidNumber(menuCandidate) - || Character.getNumericValue(menuCandidate.charAt(0)) >= Menu.menuCount - || Character.getNumericValue(menuCandidate.charAt(0)) < 0) { + || Integer.parseInt(menuCandidate) >= Menu.menuCount + || Integer.parseInt(menuCandidate) < 0) { throw new IllegalArgumentException(printError("MENU")); } return getMenu(Integer.parseInt(menuCandidate)); } - @Test - public String[] getLineAndParse() throws IllegalArgumentException { + public String[] getLineAndParse() { String[] commandArr = scanner.nextLine().split(DELIMINATOR); if(!isValidCommand(commandArr)) throw new IllegalArgumentException(printError("COMMAND")); return commandArr; } + public static void scannerClose() { scanner.close(); } diff --git a/src/main/java/view/ConsoleOutput.java b/src/main/java/view/ConsoleOutput.java index 736ebc172..6ddbe54f4 100644 --- a/src/main/java/view/ConsoleOutput.java +++ b/src/main/java/view/ConsoleOutput.java @@ -1,13 +1,15 @@ package main.java.view; +import main.java.domain.History; import main.java.domain.Menu; -import main.java.repository.Repository; -import static main.java.util.PrintOutMessage.EXIT_MESSAGE; -import static main.java.view.ConsoleInput.scannerClose; +import java.util.List; public class ConsoleOutput implements Output{ + private static final String EXIT_MESSAGE = "EXIT calculate .."; + public static final String EMPTY_MESSAGE = "Repository is EMPTY!!"; + public static String printError(String error) { return "WRONG " + error + " ! PLEASE RE-TYPE!!"; } @@ -15,7 +17,6 @@ public static String printError(String error) { // 자원정리의 주체가 output이 돼도 되나? @Override public void exitProgram() { - scannerClose(); System.out.println(EXIT_MESSAGE); } @@ -24,16 +25,22 @@ public void printResult(int result) { System.out.println(result); } - // 다형성 이용. @Override - public void showHistory(Repository repository) { - repository.showHistory(); + public void showHistory(List historyList) { + if(historyList.isEmpty()) { + System.out.println(EMPTY_MESSAGE); + return; + } + for(History historyEntity : historyList) { + System.out.println(historyEntity.getHistory()); + } } + @Override - public void printMenu() { - Menu[] menus = Menu.values(); - for(int i = 1; i < menus.length; i++) + public void printMenu(Menu[] menus) { + for(int i = 1; i < menus.length; i++) { System.out.println(menus[i]); + } System.out.println(menus[0].getMenuName()); } diff --git a/src/main/java/view/Output.java b/src/main/java/view/Output.java index 96d7d83b5..ffe6fdba0 100644 --- a/src/main/java/view/Output.java +++ b/src/main/java/view/Output.java @@ -1,10 +1,16 @@ package main.java.view; -import main.java.repository.Repository; +import main.java.domain.History; +import main.java.domain.Menu; + +import java.util.List; public interface Output { + void exitProgram(); - void showHistory(Repository repository); - void printMenu(); + void showHistory(List historyList); + + void printMenu(Menu[] menus); void printResult(int result); + } diff --git a/src/test/CommandTest.java b/src/test/CommandTest.java index c9a1a1aa0..54baae888 100644 --- a/src/test/CommandTest.java +++ b/src/test/CommandTest.java @@ -7,7 +7,6 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertEquals; public class CommandTest { @@ -29,17 +28,17 @@ public static void setting() { "Command생성할때 이미 parsing완료한다.") @Test public void parseCommandTest() { - assertArrayEquals(compOptArr, command.optArr); - assertArrayEquals(compNumArr, command.numberArr); + assertArrayEquals(compOptArr, command.getOptArr()); + assertArrayEquals(compNumArr, command.getNumberArr()); } - @DisplayName("makeHistory는 인자로 들어온 result와 " + - "연산에 이용한 command를 합쳐서 String으로 리턴하는 함수") - @Test - public void makeHistoryTest() { - String expectedHistory = "1 + 2 + 3 = 6"; - assertEquals(expectedHistory, command.makeHistory(calculator.calculate(command))); - } +// @DisplayName("makeHistory는 인자로 들어온 result와 " + +// "연산에 이용한 command를 합쳐서 String으로 리턴하는 함수") +// @Test +// public void makeHistoryTest() { +// String expectedHistory = "1 + 2 + 3 = 6"; +// assertEquals(expectedHistory, command.makeHistory(calculator.calculate(command))); +// } public static String[] stringToArray(String input) { return input.split(" "); diff --git a/src/test/MenuTest.java b/src/test/MenuTest.java new file mode 100644 index 000000000..21788880b --- /dev/null +++ b/src/test/MenuTest.java @@ -0,0 +1,12 @@ +import main.java.domain.Menu; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class MenuTest { + + @Test + public void menuCountTest() { + assertEquals(3, Menu.menuCount); + } +} From 2eb3acb52fe1b97108bcfa4929ef90d4f91844ce Mon Sep 17 00:00:00 2001 From: BeommoKoo Date: Wed, 14 Jun 2023 18:23:56 +0900 Subject: [PATCH 15/16] method / class renaming --- src/main/java/CalculateProgram.java | 4 +-- .../java/repository/MapHistoryRepository.java | 27 +++++++++++++++++++ src/main/java/repository/MapRepository.java | 26 ------------------ src/main/java/service/Calculator.java | 8 +++--- src/main/java/service/Operator.java | 2 +- src/test/MenuTest.java | 2 ++ 6 files changed, 36 insertions(+), 33 deletions(-) create mode 100644 src/main/java/repository/MapHistoryRepository.java delete mode 100644 src/main/java/repository/MapRepository.java diff --git a/src/main/java/CalculateProgram.java b/src/main/java/CalculateProgram.java index 4a373a02b..a54358ed5 100644 --- a/src/main/java/CalculateProgram.java +++ b/src/main/java/CalculateProgram.java @@ -1,7 +1,7 @@ package main.java; import main.java.controller.Controller; -import main.java.repository.MapRepository; +import main.java.repository.MapHistoryRepository; import main.java.service.Calculator; import main.java.view.ConsoleInput; import main.java.view.ConsoleOutput; @@ -9,7 +9,7 @@ public class CalculateProgram { public static void main(String[] args) { - new Controller(new ConsoleInput(), new ConsoleOutput(), new Calculator(), new MapRepository()).run(); + new Controller(new ConsoleInput(), new ConsoleOutput(), new Calculator(), new MapHistoryRepository()).run(); } } diff --git a/src/main/java/repository/MapHistoryRepository.java b/src/main/java/repository/MapHistoryRepository.java new file mode 100644 index 000000000..37ad1ec62 --- /dev/null +++ b/src/main/java/repository/MapHistoryRepository.java @@ -0,0 +1,27 @@ +package main.java.repository; + +import main.java.domain.History; + +import java.util.*; + +public class MapHistoryRepository implements HistoryRepository { + + private int historyCount; + private Map MapHistoryRepository; + public MapHistoryRepository() { + this.MapHistoryRepository = new LinkedHashMap<>(); + this.historyCount = 0; + } + + @Override + public void saveHistory(History history) { + this.MapHistoryRepository.put(historyCount, history); + historyCount++; + } + + @Override + public List getAllHistoryToList() { + return new ArrayList<>(MapHistoryRepository.values()); + } + +} diff --git a/src/main/java/repository/MapRepository.java b/src/main/java/repository/MapRepository.java deleted file mode 100644 index e7f390248..000000000 --- a/src/main/java/repository/MapRepository.java +++ /dev/null @@ -1,26 +0,0 @@ -package main.java.repository; - -import main.java.domain.History; - -import java.util.*; - -public class MapRepository implements HistoryRepository { - - private int historyCount; - private Map mapRepository; - public MapRepository() { - this.mapRepository = new LinkedHashMap<>(); - this.historyCount = 0; - } - - @Override - public void saveHistory(History history) { - this.mapRepository.put(historyCount, history); - historyCount++; - }; - - @Override - public List getAllHistoryToList() { - return new ArrayList<>(mapRepository.values()); - } -} diff --git a/src/main/java/service/Calculator.java b/src/main/java/service/Calculator.java index 93fb9607e..0779c49e9 100644 --- a/src/main/java/service/Calculator.java +++ b/src/main/java/service/Calculator.java @@ -24,10 +24,10 @@ public int calculate(Command command) { for(int i = 0; i < command.getOptCount(); i++) { // nums - stackPush(numberArr[i], stack); + calculateAndPush(numberArr[i], stack); // opts - if(optArr[i].decideToCalculate()) { + if(optArr[i].isPlusOrMinus()) { result = PM.calculateOpt(result, stack.peek()); PM = optArr[i]; stack.pop(); @@ -36,13 +36,13 @@ public int calculate(Command command) { MD = optArr[i]; } - stackPush(numberArr[command.getOptCount()], stack); + calculateAndPush(numberArr[command.getOptCount()], stack); // 마지막 command의 숫자까지 처리. result = PM.calculateOpt(result, stack.peek()); return result; } - private void stackPush(int number, Stack stack) { + private void calculateAndPush(int number, Stack stack) { if(stack.isEmpty()) { stack.push(number); return; diff --git a/src/main/java/service/Operator.java b/src/main/java/service/Operator.java index afdfbc73e..55330a059 100644 --- a/src/main/java/service/Operator.java +++ b/src/main/java/service/Operator.java @@ -24,7 +24,7 @@ public String getOptName() { return optName; } - public boolean decideToCalculate() { + public boolean isPlusOrMinus() { if(this == PLUS || this == MINUS) return true; return false; diff --git a/src/test/MenuTest.java b/src/test/MenuTest.java index 21788880b..943204b42 100644 --- a/src/test/MenuTest.java +++ b/src/test/MenuTest.java @@ -1,10 +1,12 @@ import main.java.domain.Menu; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; public class MenuTest { + @DisplayName("선택 메뉴를 제외한, 화면에 출력될 메뉴의 갯수를 테스트.") @Test public void menuCountTest() { assertEquals(3, Menu.menuCount); From 4bd94e327ba580c5bbfdefd2d76435b8984512d9 Mon Sep 17 00:00:00 2001 From: BeommoKoo Date: Wed, 21 Jun 2023 15:38:11 +0900 Subject: [PATCH 16/16] =?UTF-8?q?chore=20:=20git=20clean=20=EC=A0=84=20?= =?UTF-8?q?=EB=B0=B1=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/repository/HistoryRepository.java | 2 ++ src/main/java/repository/MapHistoryRepository.java | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/repository/HistoryRepository.java b/src/main/java/repository/HistoryRepository.java index d1e474d8f..981d47863 100644 --- a/src/main/java/repository/HistoryRepository.java +++ b/src/main/java/repository/HistoryRepository.java @@ -5,6 +5,8 @@ import java.util.List; public interface HistoryRepository { + void saveHistory(History history); List getAllHistoryToList(); + boolean isEmpty(); } diff --git a/src/main/java/repository/MapHistoryRepository.java b/src/main/java/repository/MapHistoryRepository.java index 37ad1ec62..8bb650ad6 100644 --- a/src/main/java/repository/MapHistoryRepository.java +++ b/src/main/java/repository/MapHistoryRepository.java @@ -9,13 +9,13 @@ public class MapHistoryRepository implements HistoryRepository { private int historyCount; private Map MapHistoryRepository; public MapHistoryRepository() { - this.MapHistoryRepository = new LinkedHashMap<>(); - this.historyCount = 0; + MapHistoryRepository = new LinkedHashMap<>(); + historyCount = 0; } @Override public void saveHistory(History history) { - this.MapHistoryRepository.put(historyCount, history); + MapHistoryRepository.put(historyCount, history); historyCount++; } @@ -24,4 +24,8 @@ public List getAllHistoryToList() { return new ArrayList<>(MapHistoryRepository.values()); } + @Override + public boolean isEmpty() { + return MapHistoryRepository.isEmpty(); + } }