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