From 676043c5b1f03d05a8a385c900ea9bb22fdd7cb4 Mon Sep 17 00:00:00 2001 From: sam1096 Date: Thu, 10 Jan 2019 10:34:14 +0530 Subject: [PATCH 01/13] first commit done --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b73de76..36df10f 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,4 @@ Sign your name in the list below - [Rajula Vineet Reddy](http://github.com/rajula96reddy/) - IMT2014045 +- [Samridhi Kundaliya ](https://github.com/sam1096) -MT2018101 From 61f09875cd0cc7453930f6547afa6b85d678d4f0 Mon Sep 17 00:00:00 2001 From: sam1096 Date: Thu, 17 Jan 2019 10:08:58 +0530 Subject: [PATCH 02/13] first commit today! --- Calculator.class | Bin 0 -> 1522 bytes Calculator.java | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 Calculator.class create mode 100644 Calculator.java diff --git a/Calculator.class b/Calculator.class new file mode 100644 index 0000000000000000000000000000000000000000..dce2acf83598ef21a692625538f122e6e9d45892 GIT binary patch literal 1522 zcmaJ>-*XdH6#j0KX47;_XiE@EfsLe?pfzq`qp)@Iz9yZ7Gn<2&a&=j{IV_p3hvEaR&zW^lp4 z#c^0DWRbw@`gAFSVixnboWUCzl(f8@#TC4n!CU(B_B6d0Gg!*f_}vWNGw{BFWr6fn z$8(}<0?AVOu0X2hx0FC`)A7`;US~%IO}XPzlIlpu6F6P^cJqOJC@Ze?b}Nl2aJ=2B zcARWP(%##W-Pqp12LjoK-wSM2ceH=5CSAMd%E%8EG=Pay$O}xxV7sbHSBzojqUd%4kCUtx!aB|J}qc93&cS}WWzZK@vxRJqziJSPG zWONLYEffkSHnAn}S{zQbtVe3%3Q%HQUMxRM>MP%fD~Q zL5D3TToEjDNA9Vb@7XfC=R|Fu!bo~isPn9k%p|4aanM2U8raqiYzh>IeQ>;o{+=34 zZy&lYZBFLC0ah=)>HB-Vu7J6r2eRhMFjS29%i+2VF#5A{LwYS&g~h&O^>}#>Nsc%+ z_q%F@`QiEK4^8zj(*Xph%xyT4sv5W_Fn^5SsN4iD{J$LvnC2fwKMAne$n$-gxAWWu z_pvK4A)fKT*6^KNk1;ceoNXgsF!U=%7rWC Date: Thu, 17 Jan 2019 10:26:26 +0530 Subject: [PATCH 03/13] included multiplication module --- Multiply.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 Multiply.java diff --git a/Multiply.java b/Multiply.java new file mode 100644 index 0000000..38ba449 --- /dev/null +++ b/Multiply.java @@ -0,0 +1,14 @@ +public class Multiply +{ + float a,b,res; + Multiply(float x,float y) + { + a=x; + b=y; + } + public void getResult() + { + res=a*b; + System.out.println("The result of multiplication is: "+res); + } +} From 4b32a6af954ceea2a74b02b9fa8c9b9ab09aefe0 Mon Sep 17 00:00:00 2001 From: sam1096 Date: Thu, 17 Jan 2019 10:29:25 +0530 Subject: [PATCH 04/13] included subtraction module --- Subtract.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 Subtract.java diff --git a/Subtract.java b/Subtract.java new file mode 100644 index 0000000..7f1cf66 --- /dev/null +++ b/Subtract.java @@ -0,0 +1,14 @@ +public class Subtract +{ + float a,b,res; + Multiply(float x,float y) + { + a=x; + b=y; + } + public void getRes() + { + res=a-b; + System.out.println("The result of multiplication is: "+res); + } +} From 35ee1f1bffb053074683785ad1dde972eeb01ab5 Mon Sep 17 00:00:00 2001 From: sam1096 Date: Thu, 17 Jan 2019 10:43:44 +0530 Subject: [PATCH 05/13] modified multiplication module --- Calculator.java | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/Calculator.java b/Calculator.java index b8ba92f..a35436a 100644 --- a/Calculator.java +++ b/Calculator.java @@ -8,27 +8,34 @@ public class Calculator char choice,ch; Scanner scan=new Scanner(System.in); do{ - System.out.println("1.Perform Addition"); - System.out.println("2.Exit"); + System.out.println("1.Perform Multiplication"); + System.out.println("2.Perform addition"); + System.out.println("3.Exit"); System.out.println("Enter your choice: "); choice=scan.next().charAt(0); switch(choice) - { - case '1': System.out.println("Enter two numbers: "); + { case '1': System.out.println("Enter two numbers: "); + a=scan.nextFloat(); + b=scan.nextFloat(); + Multiply m=new Multiply(a,b); + m.getResult(); + break; + + case '2': System.out.println("Enter two numbers: "); a=scan.nextFloat(); b=scan.nextFloat(); res=a+b; System.out.println("The result of addition is:" +res); break; - case '2':System.out.println("Exiting!!!"); + case '3':System.out.println("Exiting!!!"); System.exit(0); break; default:System.out.println("Entered wrong choice!!!"); break; } - }while(choice!=2); + }while(choice!='3'); } -} \ No newline at end of file +} From 8095f3b23833109fafdfce8171b815332e49457c Mon Sep 17 00:00:00 2001 From: sam1096 Date: Thu, 17 Jan 2019 10:47:34 +0530 Subject: [PATCH 06/13] modified Calculator module --- Calculator.java | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/Calculator.java b/Calculator.java index b8ba92f..fb4e98b 100644 --- a/Calculator.java +++ b/Calculator.java @@ -7,28 +7,33 @@ public class Calculator float a,b,res; char choice,ch; Scanner scan=new Scanner(System.in); - do{ - System.out.println("1.Perform Addition"); - System.out.println("2.Exit"); + do{ System.out.println("1.Perform Subtraction"); + System.out.println("2.Perform Addition"); + System.out.println("3.Exit"); System.out.println("Enter your choice: "); choice=scan.next().charAt(0); switch(choice) - { - case '1': System.out.println("Enter two numbers: "); + { case '1': System.out.println("Enter two numbers: "); + a=scan.nextFloat(); + b=scan.nextFloat(); + Subtract s =new Subtract(a,b); + s.getRes(); + break; + case '2': System.out.println("Enter two numbers: "); a=scan.nextFloat(); b=scan.nextFloat(); res=a+b; System.out.println("The result of addition is:" +res); break; - case '2':System.out.println("Exiting!!!"); + case '3':System.out.println("Exiting!!!"); System.exit(0); break; default:System.out.println("Entered wrong choice!!!"); break; } - }while(choice!=2); + }while(choice!='3'); } -} \ No newline at end of file +} From cbdd3e45ac7002a4319688b2ceed1e95738a1e09 Mon Sep 17 00:00:00 2001 From: sam1096 Date: Thu, 24 Jan 2019 09:39:45 +0530 Subject: [PATCH 07/13] Update Subtract.java --- Subtract.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Subtract.java b/Subtract.java index 7f1cf66..0585a35 100644 --- a/Subtract.java +++ b/Subtract.java @@ -1,7 +1,7 @@ public class Subtract { float a,b,res; - Multiply(float x,float y) + Subtract(float x,float y) { a=x; b=y; From 3a025a7b44157366c861b09d7f6930cd11e6f218 Mon Sep 17 00:00:00 2001 From: sam1096 Date: Thu, 24 Jan 2019 09:50:09 +0530 Subject: [PATCH 08/13] Update Subtract.java --- Subtract.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Subtract.java b/Subtract.java index 0585a35..0e701fa 100644 --- a/Subtract.java +++ b/Subtract.java @@ -3,7 +3,7 @@ public class Subtract float a,b,res; Subtract(float x,float y) { - a=x; + a=x b=y; } public void getRes() From 0cce4a04a255926bff68520ca09269f687aa2f8f Mon Sep 17 00:00:00 2001 From: sam1096 Date: Thu, 24 Jan 2019 09:53:59 +0530 Subject: [PATCH 09/13] Update Subtract.java --- Subtract.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Subtract.java b/Subtract.java index 0e701fa..0585a35 100644 --- a/Subtract.java +++ b/Subtract.java @@ -3,7 +3,7 @@ public class Subtract float a,b,res; Subtract(float x,float y) { - a=x + a=x; b=y; } public void getRes() From 1954162b30c51cdcc430981aebc55319a6718d2b Mon Sep 17 00:00:00 2001 From: sam1096 Date: Thu, 24 Jan 2019 10:20:38 +0530 Subject: [PATCH 10/13] Update Subtract.java --- Subtract.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Subtract.java b/Subtract.java index 0585a35..57420f5 100644 --- a/Subtract.java +++ b/Subtract.java @@ -4,7 +4,7 @@ public class Subtract Subtract(float x,float y) { a=x; - b=y; + b=y } public void getRes() { From c4111225cd62573f4e7f8579d92fc28912ecc412 Mon Sep 17 00:00:00 2001 From: sam1096 Date: Thu, 24 Jan 2019 10:23:55 +0530 Subject: [PATCH 11/13] Update Subtract.java --- Subtract.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Subtract.java b/Subtract.java index 57420f5..5badd68 100644 --- a/Subtract.java +++ b/Subtract.java @@ -1,10 +1,10 @@ public class Subtract { float a,b,res; - Subtract(float x,float y) + Subtract(float ,float y) { a=x; - b=y + b=y; } public void getRes() { From 2fa80f956b4a99636ef20813a7ed5fad6307b646 Mon Sep 17 00:00:00 2001 From: sam1096 Date: Thu, 24 Jan 2019 10:47:52 +0530 Subject: [PATCH 12/13] Update Subtract.java --- Subtract.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Subtract.java b/Subtract.java index 5badd68..0e701fa 100644 --- a/Subtract.java +++ b/Subtract.java @@ -1,9 +1,9 @@ public class Subtract { float a,b,res; - Subtract(float ,float y) + Subtract(float x,float y) { - a=x; + a=x b=y; } public void getRes() From eb0ab73ce968ab9e67eaad988d4eac4e281e436f Mon Sep 17 00:00:00 2001 From: sam1096 Date: Thu, 24 Jan 2019 10:53:17 +0530 Subject: [PATCH 13/13] Update Subtract.java --- Subtract.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Subtract.java b/Subtract.java index 0e701fa..0585a35 100644 --- a/Subtract.java +++ b/Subtract.java @@ -3,7 +3,7 @@ public class Subtract float a,b,res; Subtract(float x,float y) { - a=x + a=x; b=y; } public void getRes()