From 121fa2a1cf711d3ae72196e6613e4d33da3c2183 Mon Sep 17 00:00:00 2001
From: Sahan Jayawardena <sahaan.jayawardena@syscolabs.com>
Date: Tue, 7 Jan 2020 09:32:00 +0530
Subject: [PATCH 1/2] Added Modulas Added Find LArge Numbers

---
 .idea/.gitignore                    |   3 +
 .idea/misc.xml                      |   2 +-
 out/production/HelloJava/Main.class | Bin 0 -> 2686 bytes
 src/Calculater.java                 |  58 +++++++++++++++++++
 src/CalculaterMain.java             |  85 ++++++++++++++++++++++++++++
 src/Main.java                       |  18 +++++-
 6 files changed, 164 insertions(+), 2 deletions(-)
 create mode 100644 .idea/.gitignore
 create mode 100644 out/production/HelloJava/Main.class
 create mode 100644 src/Calculater.java
 create mode 100644 src/CalculaterMain.java

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..0e40fe8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+
+# Default ignored files
+/workspace.xml
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6989bdc..c9209a5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,7 +3,7 @@
   <component name="ProjectKey">
     <option name="state" value="project://63537948-39a4-48a0-9c97-34259a0fa913" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_12" default="true" project-jdk-name="12" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/out/production/HelloJava/Main.class b/out/production/HelloJava/Main.class
new file mode 100644
index 0000000000000000000000000000000000000000..498023d2da886942fd0f586779a0c4b24c01a455
GIT binary patch
literal 2686
zcma)7OH&kA6#nioGu<@JLlgu=9f%Je!Uz&XMtq>67(gRRg2u#VrUR`*&p6YAk0gd9
z{)o6qRZ^*<DsdAQn9@|rb@o}NDx0j_q$(TTn0%*acvF$7IeqRq_dLFH?>XJSy?**D
zfG#{Vun%W7oGZp4&Kn5e9a#<O7&b713py_9cvtk742<Hkjw`~)biAkIeI4UEuIjiZ
z1|R6SuHi!iRXD5TBjGm;?1d$(33<eIBt&ED_*nR)jw#`ej+?@7=}2mr*5E3Hk2<d7
z9aAW3Y93Pvo=PQbh4LZCwMTN(6L#jZHIbyIawrwIl4DlJ5xJlYdQ(o8F@}aM$Bof@
znp~l}>DtguYsQKuEq5|H>SY{vGA7ZLMH(bc(ALUK(s%0yrrb=W?TjQ{7e+yIeOw*%
z&2Q&CCm9`$Tdr$o2%@mxsh~>~%S$m*>8NMLZw*^%AGwAu4JqCRu_v4vM@kMg4GuOF
zTWC6$^c<c?Hb<1Yl}I?AlVVlcbSjZcTEuLOrgE9MJ>bZ}6ie;xg44u)G%0NHF|P!r
zA#LI|GGdT5;UTB6{p5`0B;_n47kre=k&W~k8fHw~!Ci$bt;KC^$08>S0E{+Y9L-H+
zy^IwXOh(jKon{4D5nFt5Sn#KlPTcZsh&r!cL|<u~aXmXzNSn$;dLt(8;XY5q#3%Ta
z*VAg^Gd$p;jnqPl@;n$wp)Bt^W+iiWq=Sy1i^D2yXN1+Qy|@0HlT65!hFOoFaTZ^g
zIE51?X7QzouW+B6tj^!;#|ed!LM67ZIw`7RsWp*T92bQ#oG;5aIW3yH@l-D2qqGx|
zJDHR_8Ch<Fpj?(h#WK7L6F2R+w@Q_7*ww0gS<jwU2#9x8zU`b;bkI%bJeu3qG#js`
zX~PX^{GwEjIhGwSawL`=xB74xZ-tuumKLL=BrF78J5IW5-}Pit6}B}sZ!|0Vl$D*z
zk2L3--5s`X=d2`qcvZ~&A;g-m%JeYipi8u2E1kAo-g(<b>DOf|+%V6fzG-khnB{HV
zOXW`(4SW~v<LeR7pk#RXY^D??SLC6VCs03e5kL!{VP9E<R<6yw0S=&zQZd?nCps5>
zhahDH8lNFBK98a&2=)e7tV1i-;dz8A!wb-a>jhp+UQ4Ah($=d5y7gLZ0VO{&3)ray
zMG`clBtdeBBp6PSqNF&~T!1`Vt5uo{D1C&1qHcW-Cn%Tsa(7VVgOtmCd0$B62;~Z2
zt`3V_L3xWWhqZ3KO8)^+=NVUiK~e+hI_VMVckY!*4V8jDxPYxkMcO7(h*BS=XQ&!~
zg6hic3#i#q|1)YAP`7{`G?~N8P5Rase0Q$!{biHBy9&O$SNP6u(l=7@ZCLW%q+?^j
z@vSAtIh2U+9@Z_LRpj60H*7xXA`=E`P=Y-uWoMP~yIp~!*n)m+!{4aJOKit$)Tl6O
zm5DmljCyqdyHpo;t6oG@KN{3IG%6c=)fD!tG`|NkXjTu<q8_4EeT#PWJr1hJ=uq?M
zR8Mh8Jx7=N1BcaL=ut0lME!$a^$M{-HTnXzI38$VXGx!ZjdJF0$3b*JF?$4^Tm_hS
zQFm@hH?yRBxTKqBl)UeA>@4`cSh9PyXeX1yp6+7Ce)T8bMmNvMB$~tMVc*pR3>@Jq
zggxptdbtWCM%x1@{g>lWtns`!&3zh<E&lryP|ly(7>mVvVz0PufG=-Ounc<-r(5PF
zShpkjn0)1|5BQZ==l6Z|G$0D8obP_{o3K90)Y>TL-w=f#oApr=Yom<3Aqqcb>!aLQ
b8|Bg)qVN;8K1zCRl(GMfqHxAP$ASL<JzWU$

literal 0
HcmV?d00001

diff --git a/src/Calculater.java b/src/Calculater.java
new file mode 100644
index 0000000..afa5f6c
--- /dev/null
+++ b/src/Calculater.java
@@ -0,0 +1,58 @@
+import java.util.ArrayList;
+
+public class Calculater {
+    private double num1;
+    private double num2;
+    private Double arr[];
+
+    public double addition(double num1, double num2) {
+        this.num1 = num1;
+        this.num2 =  num2;
+        return this.num1 + this.num2;
+    }
+
+    public double substraction(double num1, double num2) {
+        this.num1 = num1;
+        this.num2 =  num2;
+        return this.num1 - this.num2;
+    }
+
+    public double division(double num1, double num2) {
+        this.num1 = num1;
+        this.num2 =  num2;
+        return this.num1 / this.num2;
+    }
+
+    public double multiplication(double num1, double num2) {
+        this.num1 = num1;
+        this.num2 =  num2;
+        return this.num1 * this.num2;
+    }
+
+    public int modulas(double num1, double num2) {
+        this.num1 = num1;
+        this.num2 =  num2;
+        return (int) (this.num1 % this.num2);
+    }
+    public ArrayList<Double> findLargeAndSmall(Double arr[]){
+        this.arr = arr;
+        double large = 0;
+        double small = 0;
+        ArrayList<Double> numList = new ArrayList<>();
+
+        for(int i=0; i<this.arr.length; i++){
+            double temp = arr[i];
+            if(temp > large){
+                large = temp;
+            }
+            if(temp < small){
+                small = temp;
+            }
+        }
+
+        numList.add(0, small);
+        numList.add(1, large);
+        return numList;
+    }
+
+}
diff --git a/src/CalculaterMain.java b/src/CalculaterMain.java
new file mode 100644
index 0000000..e3bfff9
--- /dev/null
+++ b/src/CalculaterMain.java
@@ -0,0 +1,85 @@
+import java.util.ArrayList;
+import java.util.Scanner;
+
+public class CalculaterMain {
+    public static void main(String[] args) {
+        Scanner scanner = new Scanner(System.in);
+        double num1, num2;
+        String oper;
+
+        System.out.println("Available Operations :\n");
+        System.out.println("+\t--> Addition\n-\t--> Substraction\n/\t--> Division\n*\t--> Multiplication\nmod\t--> Modulas\nLarge Or Small Num \t--> los");
+
+        System.out.println("\nEnter Operator : ");
+        oper = scanner.nextLine();
+        Calculater calc = new Calculater();
+
+        switch (oper.toLowerCase()){
+            case "+":
+                System.out.println("Enter Number 1 : ");
+                num1 = scanner.nextDouble();
+
+                System.out.println("Enter Number 2 : ");
+                num2 = scanner.nextDouble();
+
+
+                System.out.println("Addition : " + calc.addition(num1, num2));
+                break;
+
+            case "-":
+                System.out.println("Enter Number 1 : ");
+                num1 = scanner.nextDouble();
+
+                System.out.println("Enter Number 2 : ");
+                num2 = scanner.nextDouble();
+
+                System.out.println("Addition : " + calc.substraction(num1, num2));
+                break;
+
+            case "/":
+                System.out.println("Enter Number 1 : ");
+                num1 = scanner.nextDouble();
+
+                System.out.println("Enter Number 2 : ");
+                num2 = scanner.nextDouble();
+
+                System.out.println("Addition : " + calc.division(num1, num2));
+                break;
+
+            case "*":
+                System.out.println("Enter Number 1 : ");
+                num1 = scanner.nextDouble();
+
+                System.out.println("Enter Number 2 : ");
+                num2 = scanner.nextDouble();
+
+                System.out.println("Addition : " + calc.multiplication(num1, num2));
+                break;
+
+            case "mod":
+                System.out.println("Enter Number 1 : ");
+                num1 = scanner.nextDouble();
+
+                System.out.println("Enter Number 2 : ");
+                num2 = scanner.nextDouble();
+
+                System.out.println("Addition : " + calc.modulas(num1, num2));
+                break;
+
+            case "los":
+                System.out.println("Enter how many numbers to input");
+                int inp = scanner.nextInt();
+
+                Double[] arr = new Double[inp];
+
+                for(int i=0; i<arr.length; i++){
+                    System.out.println("Enter Num " + i + " : ");
+                    arr[i] = scanner.nextDouble();
+                }
+
+                ArrayList<Double> res = calc.findLargeAndSmall(arr);
+                System.out.println("Small Number : " + res.get(0));
+                System.out.println("Large Number : " + res.get(1));
+        }
+    }
+}
diff --git a/src/Main.java b/src/Main.java
index 01ecfbe..0a31d1d 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -9,9 +9,14 @@ public static void main(String[] args) {
         Scanner number1 = new Scanner(System.in);
         Scanner number2 = new Scanner(System.in);
         Scanner operator = new Scanner(System.in);
-        System.out.println("Enter Operator - + / * ");
+
+        System.out.println("Available Operations :\n");
+        System.out.println("+\t--> Addition\n-\t--> Substraction\n/\t--> Division\n*\t--> Multiplication\nmod\t--> Modulas");
+
+        System.out.println("\nEnter Operator : ");
         oper = operator.nextLine();
 
+
         switch (oper){
             case "+":{
                 System.out.println("Enter Value 1 ");
@@ -46,6 +51,13 @@ public static void main(String[] args) {
                 b = number2.nextInt();
                 System.out.println("Divide : " + divide(a ,b));
             }
+            case "mod": {
+                System.out.println("Enter Value 1 ");
+                a = number1.nextInt();
+                System.out.println("Enter Value 2 ");
+                b = number2.nextInt();
+                System.out.println("Modulas : " + modulas(a ,b));
+            }
             break;
             default:
                 System.out.println("You Entered wrong operator");
@@ -69,4 +81,8 @@ private static int sub(int a, int b) {
     private static int addition(int a, int b) {
         return a + b;
     }
+
+    private static int modulas(int a, int b) {
+        return a % b;
+    }
 }

From 8f195e43d96ce771f1f1331c8d68b01735d6cbbd Mon Sep 17 00:00:00 2001
From: Sahan Jayawardena <sahaan.jayawardena@syscolabs.com>
Date: Tue, 7 Jan 2020 10:04:48 +0530
Subject: [PATCH 2/2] Added calculate Interest Rate

---
 out/production/HelloJava/Calculater.class     | Bin 0 -> 1748 bytes
 out/production/HelloJava/CalculaterMain.class | Bin 0 -> 3273 bytes
 src/Calculater.java                           |   7 +++++++
 src/CalculaterMain.java                       |  17 ++++++++++++++++-
 4 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 out/production/HelloJava/Calculater.class
 create mode 100644 out/production/HelloJava/CalculaterMain.class

diff --git a/out/production/HelloJava/Calculater.class b/out/production/HelloJava/Calculater.class
new file mode 100644
index 0000000000000000000000000000000000000000..c9b724316e91b22a0c66e20f5b43850d1a1d50a5
GIT binary patch
literal 1748
zcma)5O>Y}j6g|%~_Dr0q^U+M|(3FxE$k=J)CT&ylK}v{04KftT$P!dtyx7w)?bwdS
zGm*My%@!7j1sgU<fYh`Ir2YWb{F(|;&U@qLtF7dP-@9{t-#zEvd+y)={rMEYHB|E$
z#^Mn2xT=n8>bP!UDUU1`^SFWc)Um8SS1hbrSQ9WiNqa#+R8w<Nz>rZSaQaT|zTA_Q
zP<D1I)o!vK`l|xDwV)Hk>kRTr4ZhgywtRt+TF~)7OWNCh^o3-gz<90Olwm_gf%@({
z&G_q}C*agJW!OwY8T%1a+OpLO;-K3R$a>XkiA0=UvfYa#*-YJbE7%KqI-<}{!Z_Fs
zgQiUXv)bJjQ!%Z6yd^MpFX*&tGTQMsI<0zJhM_>&dqp*+w7?_|!pcSz$%nO|7n6_~
z`|VwJB;b$vvZ2bwyO-v&*f13-;Jzlo<niJk?!IWiD-qXT?(;fXoT|sN`QTHztDC2%
zHOf&64Aq03j*OFtoYn`f>oq9(dN+xh{>OnD+Q{Kt=GE*SjA7h?gHsL)>KMT&g`s6}
zylWQTcd(9|4nDw!gAcJOkUz{OFnXw^+uQg3CcAgUmC8$CxTSU0kYPePlo+*O?WwQZ
z_t<W)+Hc@-O&S!Cz@)czq>(AeYN>%4?!Yj&!$3w=LMx++(KqYiZGob}IM37ks_+)P
zv*jlczw59Go;mF_;L>)|08HWxzXXby;;9~g1(Ul4Oq6H$ktvt<VU!=ycm$*QEBzU$
zTm_N=h8UUG<W$bLv~QxHlNmHwMPx$LHHh%WAUHcGaYl$UN}MsxeGr_pgWz;e;<&__
zB+i+Eai#~sd2kZvEODlZb8cXqb9l2qpF92exG&GA_w6ri_R#^&5a<GdE*=4L4+i8O
z49Gng(0PtAql6&l36y8PyXCokn1!vvviTRXUp_%@C1)&Iu0=_hPk(|p=UR)8VJ+K5
z+xzZE<cjuI(Jq?b{{X9KFPq<3;^*i8Oy!KC`3LOB7@EqN-V5tD0+?D+E2IFtOTx31
zvq$I>Y0Qz%C0dtp1@pMda}^7?N&iQ<j?b|~z24Bp-QuefOPk?h*t{z&{33lU;Gp2U
zYW>+q3k|%@xC~M1c!!ortWStO%PsNvM(s!HDbZ7==RC~kOq8=QXW^1zSh!4S|BGqk
S8HS&c_B?|!diSnqYvF%z4JQ-;

literal 0
HcmV?d00001

diff --git a/out/production/HelloJava/CalculaterMain.class b/out/production/HelloJava/CalculaterMain.class
new file mode 100644
index 0000000000000000000000000000000000000000..02a3677c373e2d7ddb9263aa93eb256c81e0b652
GIT binary patch
literal 3273
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

literal 0
HcmV?d00001

diff --git a/src/Calculater.java b/src/Calculater.java
index afa5f6c..94f2e37 100644
--- a/src/Calculater.java
+++ b/src/Calculater.java
@@ -3,6 +3,7 @@
 public class Calculater {
     private double num1;
     private double num2;
+    private double interest;
     private Double arr[];
 
     public double addition(double num1, double num2) {
@@ -34,6 +35,12 @@ public int modulas(double num1, double num2) {
         this.num2 =  num2;
         return (int) (this.num1 % this.num2);
     }
+
+    public double percentage(double num, double interest){
+        this.num1 = num;
+        this.interest = interest;
+        return num * (interest / 100.0);
+    }
     public ArrayList<Double> findLargeAndSmall(Double arr[]){
         this.arr = arr;
         double large = 0;
diff --git a/src/CalculaterMain.java b/src/CalculaterMain.java
index e3bfff9..0ee71ae 100644
--- a/src/CalculaterMain.java
+++ b/src/CalculaterMain.java
@@ -8,7 +8,7 @@ public static void main(String[] args) {
         String oper;
 
         System.out.println("Available Operations :\n");
-        System.out.println("+\t--> Addition\n-\t--> Substraction\n/\t--> Division\n*\t--> Multiplication\nmod\t--> Modulas\nLarge Or Small Num \t--> los");
+        System.out.println("+\t--> Addition\n-\t--> Substraction\n/\t--> Division\n*\t--> Multiplication\nmod\t--> Modulas\nLarge Or Small Num \t--> los\nInterest Rate\t--> %");
 
         System.out.println("\nEnter Operator : ");
         oper = scanner.nextLine();
@@ -66,6 +66,16 @@ public static void main(String[] args) {
                 System.out.println("Addition : " + calc.modulas(num1, num2));
                 break;
 
+            case "%":
+                System.out.println("Enter Value : ");
+                num1 = scanner.nextDouble();
+
+                System.out.println("Enter Interest Rate : ");
+                num2 = scanner.nextDouble();
+
+                System.out.println("Interest Rate : " + calc.percentage(num1, num2));
+                break;
+
             case "los":
                 System.out.println("Enter how many numbers to input");
                 int inp = scanner.nextInt();
@@ -80,6 +90,11 @@ public static void main(String[] args) {
                 ArrayList<Double> res = calc.findLargeAndSmall(arr);
                 System.out.println("Small Number : " + res.get(0));
                 System.out.println("Large Number : " + res.get(1));
+
+                break;
+
+            default:
+                System.out.println("Invalid Operator");
         }
     }
 }