From f6b9e391ba66226893b41717df62132ec1c0c478 Mon Sep 17 00:00:00 2001 From: Chris's Razer Blade <59944262+CCShambotsProgramming@users.noreply.github.com> Date: Fri, 22 Jan 2021 11:19:36 -0500 Subject: [PATCH] version 1.2 - added total retention - similar to "Ans" on TI calculators --- .../untitled/com/company/Main.class | Bin 2867 -> 2305 bytes src/com/company/Calc.java | 42 ++++++++ src/com/company/Main.java | 96 +++++++----------- 3 files changed, 81 insertions(+), 57 deletions(-) create mode 100644 src/com/company/Calc.java diff --git a/out/production/untitled/com/company/Main.class b/out/production/untitled/com/company/Main.class index 0d58a0b0e89afe50de301f30bd6b53c1464ab202..9100d690a54e81b4a3b75db6835ece0603abf993 100644 GIT binary patch literal 2305 zcmaJ?YgZFj6x}zk8R#ew1daF@Eh6C+e3Z6?S`kH~fYKno`nn_|j3hI0W`fX%_AmIY z?H_Qh_EY_UF1uELKz~wK7k1xCSc#I=NzT2q@0@$ix%-@Z@83Ib{sJ(GpV|>YR71=_ z90`HWM{+}EO43=)++2BN6#{|8lbdRc=m&=o3G1G|*T7o_7@UK`r+fd<3C zKJ0(TN`A`^tg=AFb_9Cn!kM<4$vKs3kPkddmb2~9(5d`)2^<=1sghn+9=Z)2Ko0|P ztBk8*?3QOcyT)`J6gY6j2`tZiXnTHOI@R)ui$m$8X0e3}`rQU=Znd z*$M5EW9xBMmi+g;)-sSy-`6oL5D(lymXxhg17pZA*bP~#S~nl6X}OjGoDn!&DOu9D zOe>_sw+gOPtaGB{oIppI3g0ZaWoibNj*n>XR&A24(qy_7%aeiY>G)V6Ic$!Yqm&`j z^~_DaWK>L_8my))Nm-Nr+KgKyDXf>Aj?V6{R-KLH!>^S=>u4%{_ zxQ-iShk;~NFw)t|%*awfaab%0oNkejy`-meD$nyO$qNE8^1_^5#VrGi%6inVt|**0 zuoU8Qm6Tq^vVl7xF4`MO?u>f|?&E>L!LnSpW?ZKrgFAM>g*kp8oq(AdXc10}9BBCJ zy*15CwH0DDjyhEREQA%hBv(pgEji~FWNBG?w!-znSg>Z(XL7EY9A$`%$I79>-oXbg z*jQ$v*M^(7D`!RAin7<(?)4IB z?RmHA6|7lXt*1?eIi~!OhfA&-_<<)Y^H#9t7X6L{xH|$=HEbxxp9u6fLb9C=ciqa= zBC91~Ru))@TLM2f(_dGt8NDW*V#)IR=UjKaTFLHRV$;Yw6PLCsRtxoJ9(H%+UK6a; zQr-@%tPVz(zRk0t!sF8_n&Bp$G=(`fHs)C@A1~lpVpcqN)ss9Kjhs3`XG+rdEnmYA z0;l#+&}wBGo(dfMe^s6=H5zaNU-G0^PXs(mkYM{YQHH%>A0K)J@kjXi8@B2*2k|Xi zqy8?jLez!=iX7qO$a6%Y10sk{{R!>fOSHX0$7Jj!lF8m}97@Huacq7hd2$>5zrq+v z4)Ns|=zXs-GOv`zca;`Kca=t)l@^rJSt_aie7&F8oirIw#U~Sy2`!b_#wWiswx^Uh zWr(s!8K#_}j8dj48OmeICPk(a$*C}&+31A!0vCxdgm@yR@Hp|s5D&x^Hi<8VxHqA2 zC-LPFC$tHzNBd3Lq^KuGIYCjrm0u-`Bcrb|JH?gsZDWr96u#NO;|hP#z^1~t8@Q7* zQ}H*r3y^>pJI`q|3YDu39A&FBvAlfw>qQ4ozfRr}T{wqsWO-{&qX&6@xr;;0X$osN zj0*bjgjZodj*B6f;tY<7^SrYr(J!WPQe4JqaUFwV5d&h0H_&~I2#Fz4#F%)D@vt^7 zuu}Gm0zF$?^%MMqhgelP5CMJIj4L8M=HU@5=7_k9b$*TT7C46z-=Zi};|99^rP>aL zHC`kdwAfo5M_hv=I1v6da=L>DH7Gjx7$;TxmcrpoG9Z@^q KzQ>PvhSYz}x)$>Q literal 2867 zcmai0TUQfT6#h;~GD92%f&oD&gGD6V;x$(Aj!W-gEZl?EUR?^5psBzX1&3mjoiH zQV`V;LtLQthOuB|Y{Qw!oSnX5<^qBEVau_CqXJc3=_v)OKwY?~7+7{@B4;>`=~W|v zO$sy(o3Z5;D-%n8V9pCfEJq+U7HV2S2|1=}=yQ#Zq4d^6`d`EoQW+68LD z&H1_v!Zrg_#oP3KuB2qijq7f~^o+puRO}Q;_UOHOAE{e+J$;drOai;mr68@L8$GY) zGYp%N&Kmygkeg?utjnm1J^|4q^)ecEV-M?Q-Ygonzh>K|st%?vsn|!2J{1QzbgMYX zVNt~)4s@TwpoYUZLhD98FR*Ka)U8iXdQ<}8n1wB*M$jEDSu(U$yK4d+5WZ!IK=@DDXi zU{auQ-k39oTqkD)7p#DZbNs+?0%oUkgPmbAC8KRh;3HgAa7n{uTv=&`5G11n z#Ej{&I0eJ=O|ol}zk)fI>nbwGDr${H;h7NPlg6~oGAGB} zoMBHHo+bIRFdEES+(dG0E$RnpX+A`ML)YaEDmBHn2;9K1S?^KCQd&~k)6xQaj7UnZ z*DrnB%f5CCoEzQ@qp07&k-+AOz{t&w8-*}r1+tt0+f1tE^E599T8grylH(vb7F2Q^ zB*!dCjsv;Ggj@7-=7=TJQZ0MDU*d;-a?*7JKk$sgxEaj4dA}x(FBA9*Un{sRk?@T` zM+mjBUY4`q&Y77~RZ8F(F>-9nC4pZnVNqUKGJ4u@^0w)BjJfVyu`swkHx-gs6epJo z<_60vleW^G>rD(9wmo45=Aer21k&euP!)JQn|Xb~u#4t^F7*EXe$OPVy?_UsUhv!* z&)~_cjmi^x$Toc6^cCC@*tsqR8|_TNPXcefeko6xQX0_C=8Lf5z|)k_LY(hU$YnSR zj@#0 ze?sF`VZx_*JIds4;sIUDcZz9m=55`EE$BcE(v4fq$0_>ZfeVY`T- zMabK)2D)hEE!T_=(azf|jZV>vE|FzYWihYN$5YzBju|51*~*N1Wf`?rzHSmdj9`|< zPEl&%2Eoxr>vNn{VZVsL=8VY_hcFL^)?Lyb>b!stML|K4?_H}u0o3r(cGU5C!AJzx zP$eP%8qkddWR_024k{Dfy^QlOF)9BFNh~N#gxpFAmnv>D2x)`YVcEu2u9P+0()|b* zj`Z+#w59dheM(B`-oo&~TR6sG6WAMC>n>@8+vG>4U2aphN;NztE5emgZfl0R33{?#~^fgFdhu`RHVb#~CWna9U%f9ZEbJ+Sa zhpl&^wETud@?(NGa=)e3maa?qZRU{y9HZ;wbbSIzoFqDjSk~c+Fj`mB+q#y=ui+lv1;qy=~@C8Hs7T=RgaP|X!#LsB@AG`fjg#Z8m diff --git a/src/com/company/Calc.java b/src/com/company/Calc.java new file mode 100644 index 0000000..a838c6c --- /dev/null +++ b/src/com/company/Calc.java @@ -0,0 +1,42 @@ +package com.company; + +public class Calc { + int num1; + int num2; + + + public static String main(String op,int num1,int num2) { + + return ""; + } + + //math functions + public static void print(String text){ + System.out.println(text); + } + public static int add(String num1, String num2){ + int add1 = Integer.parseInt(num1); + int add2 = Integer.parseInt(num2); + return add1 + add2; + } + public static int sub(String num1, String num2){ + int sub1 = Integer.parseInt(num1); + int sub2 = Integer.parseInt(num2); + return sub1 - sub2; + } + public static int mul(String num1, String num2){ + int mul1 = Integer.parseInt(num1); + int mul2 = Integer.parseInt(num2); + return mul1 * mul2; + } + public static int div(String num1, String num2){ + int div1 = Integer.parseInt(num1); + int div2 = Integer.parseInt(num2); + if (div2 == 0 || div1 == 0){ + print("cant divide by zero"); + return -1; + } + return div1 / div2; + } + +} diff --git a/src/com/company/Main.java b/src/com/company/Main.java index 7cd15d3..b747323 100644 --- a/src/com/company/Main.java +++ b/src/com/company/Main.java @@ -4,65 +4,47 @@ import java.util.Scanner; public class Main { @SuppressWarnings("InfiniteLoopStatement") - public static void main(String[] args) - { - while(true) { - Scanner in = new Scanner(System.in); - print("Enter first number: "); - String num1 = in.nextLine(); - print("please enter second number"); - String num2 = in.nextLine(); - print("Inputs complete"); - print("Please input operator"); - print("+ , - , * or x , /"); - String op = in.nextLine(); + public static void main(String[] args) { + int total = 0; + String num1; + String num2; + while (true) { - switch (op) { - case "+" -> { - int total = add(num1, num2); - System.out.println(total); - } - case "-" -> { - int total = sub(num1, num2); - System.out.println(total); - } - case "*", "x" -> { - int total = mul(num1, num2); - System.out.println(total); - } - case "/" -> { - int total = div(num1, num2); - System.out.println(total); - } - default -> print("Unexpected value: " + op + " ...restarting program"); + Scanner in = new Scanner(System.in); + System.out.println("Enter first number: "); + num1 = in.nextLine(); + if (num1.equals("ans") || num1.equals("total")) { + num1 = String.valueOf(total); } + System.out.println("please enter second number"); + num2 = in.nextLine(); + if (num2.equals("ans") || num2.equals("total")) { + num2 = String.valueOf(total); + } + System.out.println("Inputs complete"); + System.out.println("Please input operator"); + System.out.println("+ , - , * or x , /"); + String op = in.nextLine(); + + switch (op) { + case "+" -> { + total = Calc.add(num1, num2); + System.out.println(total); + } + case "-" -> { + total = Calc.sub(num1, num2); + System.out.println(total); + } + case "*", "x" -> { + total = Calc.mul(num1, num2); + System.out.println(total); + } + case "/" -> { + total = Calc.div(num1, num2); + System.out.println(total); + } + default -> System.out.println("Unexpected value: " + op + " ...restarting program"); + } } } - private static void print(String text){ - System.out.println(text); - } - private static int add(String num1, String num2){ - int add1 = Integer.parseInt(num1); - int add2 = Integer.parseInt(num2); - return add1 + add2; - } - private static int sub(String num1, String num2){ - int sub1 = Integer.parseInt(num1); - int sub2 = Integer.parseInt(num2); - return sub1 - sub2; - } - private static int mul(String num1, String num2){ - int mul1 = Integer.parseInt(num1); - int mul2 = Integer.parseInt(num2); - return mul1 * mul2; - } - private static int div(String num1, String num2){ - int div1 = Integer.parseInt(num1); - int div2 = Integer.parseInt(num2); - if (div2 == 0 || div1 == 0){ - print("cant divide by zero"); - return -1; - } - return div1 / div2; - } } \ No newline at end of file