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 1/5] 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#{|8l<nBT1%c>bdRc=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)u<xQIHNa3)CJ_AQ^RG@n|l&0ANT1D9^
zsaWfggj_IE+gZ(~msPCC4VX9~pgY!PFlRd!9S){zaW`x0_>i$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?V<du#V5!jp~?YH>6{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<(?)4I<J?X8|S9c3@OjnKy+)*qn)twdCmk(rNeO^|=P&L>B
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$;Txmc<!sDAHIIu5!x7sYL5^>rpoG9Z@^q
KzQ>PvhSYz}x)$>Q

literal 2867
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

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
-- 
2.43.0


From 909d5353df2263f061c5508d0d43fd07b936cc9a Mon Sep 17 00:00:00 2001
From: Chris's Razer Blade
 <59944262+CCShambotsProgramming@users.noreply.github.com>
Date: Fri, 22 Jan 2021 11:36:34 -0500
Subject: [PATCH 2/5] version 1.2  - added total retention   - similar to "Ans"
 on TI calculators  -made Calc class to hold all Calc methods

---
 src/com/company/Main.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/company/Main.java b/src/com/company/Main.java
index b747323..8f628a6 100644
--- a/src/com/company/Main.java
+++ b/src/com/company/Main.java
@@ -43,7 +43,7 @@ public class Main {
                         total = Calc.div(num1, num2);
                         System.out.println(total);
                     }
-                    default -> System.out.println("Unexpected value: " + op + " ...restarting program");
+                    default -> System.out.println("Unexpected value: '" + op + "' ...restarting program");
                 }
         }
     }
-- 
2.43.0


From ddc615456a2949ec57f98431fb29774d65c4df73 Mon Sep 17 00:00:00 2001
From: Chris's Razer Blade
 <59944262+CCShambotsProgramming@users.noreply.github.com>
Date: Fri, 22 Jan 2021 12:23:33 -0500
Subject: [PATCH 3/5] added error code to div by 0

---
 .../untitled/com/company/Main.class           | Bin 2305 -> 2307 bytes
 src/com/company/Calc.java                     |   1 +
 2 files changed, 1 insertion(+)

diff --git a/out/production/untitled/com/company/Main.class b/out/production/untitled/com/company/Main.class
index 9100d690a54e81b4a3b75db6835ece0603abf993..34f443d546e2b7853e9dcb9cb59c3f6de7d2c409 100644
GIT binary patch
delta 35
qcmZn^Y8Kj%z$&I4nwMHpkeXbQnxasam{Xc+rJ&BJzPW_8ml*)ijSDsa

delta 33
ocmZn`Y82X#z$&5{nwMHpkeXbQnxasam{Xc+rNFqkjJ1~;0K2*h<^TWy

diff --git a/src/com/company/Calc.java b/src/com/company/Calc.java
index a838c6c..0f713ff 100644
--- a/src/com/company/Calc.java
+++ b/src/com/company/Calc.java
@@ -34,6 +34,7 @@ public class Calc {
         int div2 = Integer.parseInt(num2);
         if (div2 == 0 || div1 == 0){
             print("cant divide by zero");
+            print("error code:");
             return -1;
         }
         return div1 / div2;
-- 
2.43.0


From 1bfae4246062c07b8dd444faefd65f39874dfc0e Mon Sep 17 00:00:00 2001
From: Chris's Razer Blade
 <59944262+CCShambotsProgramming@users.noreply.github.com>
Date: Fri, 22 Jan 2021 12:38:27 -0500
Subject: [PATCH 4/5] Version 1.3 - added decimal functionality (changed int to
 double)

---
 src/com/company/Calc.java | 32 ++++++++++++++------------------
 src/com/company/Main.java |  2 +-
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/com/company/Calc.java b/src/com/company/Calc.java
index 0f713ff..8e680e6 100644
--- a/src/com/company/Calc.java
+++ b/src/com/company/Calc.java
@@ -1,37 +1,33 @@
 package com.company;
 
+
 public class Calc {
+    //constructor of num variables
     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);
+    public static double add(String num1, String num2){
+        double add1 = Double.parseDouble(num1);
+        double add2 = Double.parseDouble(num2);
         return add1 + add2;
     }
-    public static int sub(String num1, String num2){
-        int sub1 = Integer.parseInt(num1);
-        int sub2 = Integer.parseInt(num2);
+    public static double sub(String num1, String num2){
+        double sub1 = Double.parseDouble(num1);
+        double sub2 = Double.parseDouble(num2);
         return sub1 - sub2;
     }
-    public static int mul(String num1, String num2){
-        int mul1 = Integer.parseInt(num1);
-        int mul2 = Integer.parseInt(num2);
+    public static double mul(String num1, String num2){
+        double mul1 = Double.parseDouble(num1);
+        double mul2 = Double.parseDouble(num2);
         return mul1 * mul2;
     }
-    public static int div(String num1, String num2){
-        int div1 = Integer.parseInt(num1);
-        int div2 = Integer.parseInt(num2);
+    public static double div(String num1, String num2){
+        double div1 = Double.parseDouble(num1);
+        double div2 = Double.parseDouble(num2);
         if (div2 == 0 || div1 == 0){
             print("cant divide by zero");
             print("error code:");
diff --git a/src/com/company/Main.java b/src/com/company/Main.java
index 8f628a6..564d81b 100644
--- a/src/com/company/Main.java
+++ b/src/com/company/Main.java
@@ -5,7 +5,7 @@ import java.util.Scanner;
 public class Main {
     @SuppressWarnings("InfiniteLoopStatement")
     public static void main(String[] args) {
-        int total = 0;
+        double total = 0;
         String num1;
         String num2;
         while (true) {
-- 
2.43.0


From a7da565992a564c9a1879da3e82f355d83a93b8f Mon Sep 17 00:00:00 2001
From: Chris's Razer Blade
 <59944262+CCShambotsProgramming@users.noreply.github.com>
Date: Thu, 18 Mar 2021 12:44:57 -0400
Subject: [PATCH 5/5] Version 1.3.1 - added rounded multiplication and division
 with remainders.

---
 .../untitled/com/company/Main.class           | Bin 2307 -> 2737 bytes
 src/com/company/Calc.java                     |  33 +++++++++---
 src/com/company/Main.java                     |  49 ++++++++++--------
 3 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/out/production/untitled/com/company/Main.class b/out/production/untitled/com/company/Main.class
index 34f443d546e2b7853e9dcb9cb59c3f6de7d2c409..eaf63133c9dd6d1d18068f487679accf4f098aae 100644
GIT binary patch
delta 1415
zcmYLJUu;uV9RAL|x4n1uuB+9-3bT{}xofvlWM+X*nQlWj|IBSnU^3CN7FXR?Y}Z)?
ztvH9`K*8(Fcrf8<iTW~33YpOd!-LW23-QI67+*BenD}gT^E+oHz3K0K=ljn0yXTx=
zez)_%l}6vUYpY)YNWxw5eIrDldt00-Ti7qq;hfCnBl%o$CY?z~ri)Xv*;7;5iPUU1
zH<OGM3z>)$%RB86=V;!E(CL)&j)g9P=tg2@I+bN=K9bJPWec^W#K?v{k#~I9g@<e$
zK(~N3nJP^7=F%B~QN1-fVBrw~(Pp8S5VvrU5VP<Yp=4ozkg)KCfL0o@@RY>7g{O%L
z@?nX29}Z#E#4|Py<A}SY^&IQ-A%rm-&3IP8Xzhz0mY#7N&*6xGUMQZB{COKMD9%eu
ze!|9t;=GCE85<|@B9F}V5m_IBeXZ`F#(nOPz9k|ZSsO1&M;$XpR3U;a@|2Bf%(#wz
zP@Hn7_3v5jE+Zn&y5mN|f8K|8@UDpq()6CYWZV)L-Q%8a@qzoXCuUp`2)oxjVfPP@
zUCu${>%dXK124x{$Pz?B^u%sJtf=KYN4ZQ91&(%gK8qq*9p>;V6(;M$(8-~N{rz9S
z9J`LX8)!&+t|J)SR6$e7Q$ctz9&D*#=T-Nr_pY*Y6YYa?dC#5Yq!BVU45;TUM(Yyl
zq%Ubm<6asiK2XKZD(<UdlBo7cdPCl%sdZW*vw{ad<w<{4rv+j}dDS+QfniSKj1(im
zxWXtg&hgGV@oVA^;%&hH6Y(1HAL2^L3_h$5cR}y8mN8G>qxfk<@&b9E;#rU66XcI7
zKIWDD5P5%D2?M4SdMP}v_<l?B4)P}zj|Nmm3xz=?GzC<~-4uqDU<R1dXnn$S;UhWl
zu^4+9y^PUnWQcRsSRj@c;vwTEM*3M%r-Gx)NGai1O&C(b@tV-Bgj7w~&19veS^8yc
zyF(`x4UmSst9TiZ{J-D1tq$2z=dqpj=Q%ZYlppoj#IYF-*o^=>5JVU5K@aZbch`t<
zY(^SQnBu25i!C^dt$3U6MTEs?h=|XzU94i8_!2wCE$kBCVTbqut>Q;S#m{iWFK8FP
zAuj$xoA?_Ev5q~OALaYCt=vjB^#QiHU#sUaN^J8*aT%xa8Z|aE&Tu<Uv}U%<>umLA
zO~V^p)zQP3mpL==CLP1r{4X?p4Q(d>lT4V#I$Gc{aZab8ekMPnH7ssWG0>o%K%l-O
nz{l@jXDN)DpYPQ1mfRcjysj*kzyf0tm&kmay^qWI5TXA8FSrJ#

delta 1016
zcmYjQNlz3}5dLbWHzqC1D1;Fh76D<HVF^lfKz7h!Qv{L4jZHy8WJgiP#Df<TL;9rg
zPNF9`3<MKT9*l`6Fa8!|!0)vh?C!7Xef6rV>UC9br@!#~z8>s<0uaUXZQmD>nDbrM
zJAEj^d7H*sfi*R{IMp&YF)8qtl*TMv5J;JY2C9gKCaREy7OFK1ZB!LLT*M_4F&iD|
zbn?B;T`?a5=(drK9)VU8D;-ciS8Vj6lVKN^#}x0g(eLuv<r&2XY+QHw#Po`vH4fPr
z#)y-ywaHCqMEk~KOZ7aNb~^Nm<V7Eruxw&QIjuS`_0RIy=`tGRsq@MRX&Zu|^V$eH
zKMXs510IG0r9g*4d5f%qTB!BVE@a!?zD=pNX~Z2$`|o-bV`NDf#{?~W*|P~REI^jL
zbsu34?I39vDN$_)et$*+nE@?<V0YMGkU-(vv#`Vd5La(tW$hu{t-LD#dG$p8c)^bR
z@6_YGGc)6EoTwhqqlTx(3>XQV`@l*z2%QKKy+j#NMMQ`uqJo$w)`-!7;jeR(w|i^M
zEi{tXySzqIypp`p<;A+<dF0J5&oJW3kV-?VYcR|jGu?czf)eV|h<rjNSBVvR!;w9-
z*YS{933M@`;+KzjrQ%nQc%I_dj(95H4Cwn91mgTiTL+sA>V@jf3UVkdHu4yfd1oMn
zGnR^Sq@fzeQHv8SAsv0(8AK*~7{C-x;t{g2iX16Ku7r>$RS3!%oRTOCr3nSniqq18
z66r;;^rK9M5tdPeBtC(1nMb8N4D}q1WEp4bNuGNZKXDiLR2yW8Nv2ttM;6$M`y7#M
z8N>tbdicLoV}>g)X6ez1v|n^PK$*#3&V;EQA{V-eheCt<nEa{-7;)EaMUukHE>QB2
h<ER~ZGMX22Dl3ntnr$)f0<nfCWInFe@eFYUegkbHo$det

diff --git a/src/com/company/Calc.java b/src/com/company/Calc.java
index 8e680e6..63ca972 100644
--- a/src/com/company/Calc.java
+++ b/src/com/company/Calc.java
@@ -2,14 +2,10 @@ package com.company;
 
 
 public class Calc {
-    //constructor of num variables
-    int num1;
-    int num2;
-
-    //math functions
-    public static void print(String text){
-        System.out.println(text);
+    public static void print(String text) { //this is a small function to makes it easier to print out to terminal
+        System.out.println(text); //similar to python output
     }
+    //math functions
     public static double add(String num1, String num2){
         double add1 = Double.parseDouble(num1);
         double add2 = Double.parseDouble(num2);
@@ -25,6 +21,7 @@ public class Calc {
         double mul2 = Double.parseDouble(num2);
         return mul1 * mul2;
     }
+
     public static double div(String num1, String num2){
         double div1 = Double.parseDouble(num1);
         double div2 = Double.parseDouble(num2);
@@ -35,5 +32,27 @@ public class Calc {
         }
         return div1 / div2;
     }
+    public static String mulRound(String num1, String num2){
+        double mul1 = Double.parseDouble(num1);
+        double mul2 = Double.parseDouble(num2);
+        return Math.round(mul1 * mul2) + "rounded";
+    }
+    public static String divRemain(String num1, String num2){
+        double div1 = Double.parseDouble(num1);
+        double div2 = Double.parseDouble(num2);
+        if (div2 == 0){
+            print("cant divide by zero");
+            print("error code:");
+            return "-1";
+        }
+        else if (div1 == 0)
+            return "0";
+        else {
+            int div1I = (int) div1;
+            int div2I = (int) div2;
+            int divT = div1I / div2I;
+            return divT + " with remainder of: " + div1 % div2;
+        }
 
+    }
 }
diff --git a/src/com/company/Main.java b/src/com/company/Main.java
index 564d81b..fc52820 100644
--- a/src/com/company/Main.java
+++ b/src/com/company/Main.java
@@ -9,7 +9,6 @@ public class Main {
         String num1;
         String num2;
         while (true) {
-
             Scanner in = new Scanner(System.in);
             System.out.println("Enter first number: ");
             num1 = in.nextLine();
@@ -21,30 +20,34 @@ public class Main {
             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();
+            System.out.println("Inputs complete");
+            System.out.println("Please input operator");
+            System.out.println("+ , - , * or x , /");
+            System.out.println("'for rounded multiplication: use '*r', 'Xr' or 'xr'");
+            System.out.println("'for remainder division: use '/R' or '/r'");
+            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");
+            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);
+                }
+                case "*/", "xR", "xr" -> System.out.println(Calc.mulRound(num1, num2));
+                case "/R", "/r" -> System.out.println(Calc.divRemain(num1, num2));
+                default -> System.out.println("Unexpected value: '" + op + "' ...restarting program");
+            }
         }
     }
 }
\ No newline at end of file
-- 
2.43.0