From fc5dda858a04e3a8af6deb649e38b7217e69e835 Mon Sep 17 00:00:00 2001 From: nourelsakhey <36204564+nourelsakhey@users.noreply.github.com> Date: Sat, 29 Feb 2020 12:19:58 +0200 Subject: [PATCH 01/13] Update Main.java 20170320 --- src/Main.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Main.java b/src/Main.java index 9b8c2b0..45c1711 100644 --- a/src/Main.java +++ b/src/Main.java @@ -1,9 +1,11 @@ + import java.util.Scanner; public class Main { - private static ISubscriber subscribers [] = { + private static final ISubscriber subscribers [] = { new SimpleSubscriber(), new ReallySimpleSubscriber(), + new CircleCircumference() }; public static void main(String[] args) { Topic mathTopic = new Topic(); @@ -15,3 +17,5 @@ public static void main(String[] args) { mathTopic.dispatchEvent(input); } } + +} From 9000119a2c63e1bcbbcdd20b491e1299c7c3028b Mon Sep 17 00:00:00 2001 From: nourelsakhey <36204564+nourelsakhey@users.noreply.github.com> Date: Sat, 29 Feb 2020 12:22:48 +0200 Subject: [PATCH 02/13] 20170320 20170320 --- src/CircleCircumference.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/CircleCircumference.java diff --git a/src/CircleCircumference.java b/src/CircleCircumference.java new file mode 100644 index 0000000..f69da39 --- /dev/null +++ b/src/CircleCircumference.java @@ -0,0 +1,17 @@ + +public class CircleCircumference implements ISubscriber { + + public CircleCircumference() { + + } + + @Override + public void notifySubscriber(String input){ + double x= Double.parseDouble(input); + double y=2*3.14*x; + System.out.print("the circumference equals "); + System.out.println(y); + } + + +} From 318afb845538641e2265cb80586a49993f371529 Mon Sep 17 00:00:00 2001 From: ThoriaHamdy99 Date: Sat, 29 Feb 2020 21:03:50 +0200 Subject: [PATCH 03/13] Thoria hamdy 20170082 SphereVolume --- .idea/.gitignore | 2 ++ .idea/.name | 1 + .idea/misc.xml | 6 ++++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ GitAssignmentObserver.iml | 12 ++++++++++++ src/CircleCircumference.java | 5 +---- src/Main.java | 5 +++-- src/SphereVolume.java | 17 +++++++++++++++++ 9 files changed, 56 insertions(+), 6 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/.name create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 GitAssignmentObserver.iml create mode 100644 src/SphereVolume.java diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..5c98b42 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,2 @@ +# Default ignored files +/workspace.xml \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..477e576 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +GitAssignmentObserver \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..84da703 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..3dd0b66 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/GitAssignmentObserver.iml b/GitAssignmentObserver.iml new file mode 100644 index 0000000..8fe52dd --- /dev/null +++ b/GitAssignmentObserver.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/CircleCircumference.java b/src/CircleCircumference.java index f69da39..437ce85 100644 --- a/src/CircleCircumference.java +++ b/src/CircleCircumference.java @@ -1,10 +1,7 @@ public class CircleCircumference implements ISubscriber { - public CircleCircumference() { - - } - + public CircleCircumference() { } @Override public void notifySubscriber(String input){ double x= Double.parseDouble(input); diff --git a/src/Main.java b/src/Main.java index 45c1711..a357eeb 100644 --- a/src/Main.java +++ b/src/Main.java @@ -5,7 +5,9 @@ public class Main { private static final ISubscriber subscribers [] = { new SimpleSubscriber(), new ReallySimpleSubscriber(), - new CircleCircumference() + new CircleCircumference(), + new SphereVolume() + }; public static void main(String[] args) { Topic mathTopic = new Topic(); @@ -18,4 +20,3 @@ public static void main(String[] args) { } } -} diff --git a/src/SphereVolume.java b/src/SphereVolume.java new file mode 100644 index 0000000..a2fa0a1 --- /dev/null +++ b/src/SphereVolume.java @@ -0,0 +1,17 @@ +import java.lang.Math; + +public class SphereVolume implements ISubscriber { + private double radius; + private double volume; + + public SphereVolume(){radius = 0; volume = 0;} + + @Override + public void notifySubscriber(String input) { + radius = Double.parseDouble(input); + volume = ((double)4 / 3) * 3.14 * Math.pow(radius, 3); + + System.out.print("The SphereVolume = "); + System.out.println(volume); + } +} From 9c2bf54a1f0a955a21bb17aa2023ee1c32281258 Mon Sep 17 00:00:00 2001 From: nourelsakhey <36204564+nourelsakhey@users.noreply.github.com> Date: Sun, 1 Mar 2020 20:40:06 +0200 Subject: [PATCH 04/13] Delete SphereVolume.java --- src/SphereVolume.java | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/SphereVolume.java diff --git a/src/SphereVolume.java b/src/SphereVolume.java deleted file mode 100644 index a2fa0a1..0000000 --- a/src/SphereVolume.java +++ /dev/null @@ -1,17 +0,0 @@ -import java.lang.Math; - -public class SphereVolume implements ISubscriber { - private double radius; - private double volume; - - public SphereVolume(){radius = 0; volume = 0;} - - @Override - public void notifySubscriber(String input) { - radius = Double.parseDouble(input); - volume = ((double)4 / 3) * 3.14 * Math.pow(radius, 3); - - System.out.print("The SphereVolume = "); - System.out.println(volume); - } -} From d664044401f258b6d08884ce2b22bff93ba74d91 Mon Sep 17 00:00:00 2001 From: nourelsakhey <36204564+nourelsakhey@users.noreply.github.com> Date: Sun, 1 Mar 2020 20:40:35 +0200 Subject: [PATCH 05/13] Update Main.java --- src/Main.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Main.java b/src/Main.java index a357eeb..67a1b7e 100644 --- a/src/Main.java +++ b/src/Main.java @@ -5,8 +5,8 @@ public class Main { private static final ISubscriber subscribers [] = { new SimpleSubscriber(), new ReallySimpleSubscriber(), - new CircleCircumference(), - new SphereVolume() + new CircleCircumference() + }; public static void main(String[] args) { From 60ea6561426d36235f202446f689f00388d555cf Mon Sep 17 00:00:00 2001 From: nourelsakhey <36204564+nourelsakhey@users.noreply.github.com> Date: Sun, 1 Mar 2020 20:42:21 +0200 Subject: [PATCH 06/13] Delete CircleCircumference.java --- src/CircleCircumference.java | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 src/CircleCircumference.java diff --git a/src/CircleCircumference.java b/src/CircleCircumference.java deleted file mode 100644 index 437ce85..0000000 --- a/src/CircleCircumference.java +++ /dev/null @@ -1,14 +0,0 @@ - -public class CircleCircumference implements ISubscriber { - - public CircleCircumference() { } - @Override - public void notifySubscriber(String input){ - double x= Double.parseDouble(input); - double y=2*3.14*x; - System.out.print("the circumference equals "); - System.out.println(y); - } - - -} From ea6a32b91d3fe84b57bc13ddfec33cab955e3876 Mon Sep 17 00:00:00 2001 From: nourelsakhey <36204564+nourelsakhey@users.noreply.github.com> Date: Sun, 1 Mar 2020 20:42:37 +0200 Subject: [PATCH 07/13] Delete SphereVolume.java --- src/SphereVolume.java | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/SphereVolume.java diff --git a/src/SphereVolume.java b/src/SphereVolume.java deleted file mode 100644 index a2fa0a1..0000000 --- a/src/SphereVolume.java +++ /dev/null @@ -1,17 +0,0 @@ -import java.lang.Math; - -public class SphereVolume implements ISubscriber { - private double radius; - private double volume; - - public SphereVolume(){radius = 0; volume = 0;} - - @Override - public void notifySubscriber(String input) { - radius = Double.parseDouble(input); - volume = ((double)4 / 3) * 3.14 * Math.pow(radius, 3); - - System.out.print("The SphereVolume = "); - System.out.println(volume); - } -} From 1f40deb433533cf695f7ce84ff114cd8f2b8217d Mon Sep 17 00:00:00 2001 From: nourelsakhey <36204564+nourelsakhey@users.noreply.github.com> Date: Sun, 1 Mar 2020 20:43:20 +0200 Subject: [PATCH 08/13] Update Main.java --- src/Main.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Main.java b/src/Main.java index a357eeb..a32b990 100644 --- a/src/Main.java +++ b/src/Main.java @@ -4,9 +4,8 @@ public class Main { private static final ISubscriber subscribers [] = { new SimpleSubscriber(), - new ReallySimpleSubscriber(), - new CircleCircumference(), - new SphereVolume() + new ReallySimpleSubscriber() + }; public static void main(String[] args) { From 111804f703d2826e712cdad21b8d4fa776108ef4 Mon Sep 17 00:00:00 2001 From: YahiaNabil Date: Sun, 1 Mar 2020 20:46:45 +0200 Subject: [PATCH 09/13] Mostafa Mohamed 20140272 SummationSeries --- src/Main.java | 3 ++- src/SummationSeries.java | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 src/SummationSeries.java diff --git a/src/Main.java b/src/Main.java index a357eeb..c083d46 100644 --- a/src/Main.java +++ b/src/Main.java @@ -6,7 +6,8 @@ public class Main { new SimpleSubscriber(), new ReallySimpleSubscriber(), new CircleCircumference(), - new SphereVolume() + new SphereVolume(), + new SummationSeries() }; public static void main(String[] args) { diff --git a/src/SummationSeries.java b/src/SummationSeries.java new file mode 100644 index 0000000..8677cd4 --- /dev/null +++ b/src/SummationSeries.java @@ -0,0 +1,34 @@ +public class SummationSeries implements ISubscriber +{ + public SummationSeries() {} + + int factorial(int t) + { + int mul = 1; + + while(t > 0) + { + mul = mul * t; + + t--; + } + return mul; + } + + + + @Override + public void notifySubscriber(String input) + { + double y = 0; + int x=Integer.parseInt(input); + + SummationSeries mSummationSeries = new SummationSeries(); + for(int i = 1; i <= x; i++) + { + y = y + (double)i / (mSummationSeries.factorial(i)); + } + System.out.println("Summation Series: "+y); + } + +} \ No newline at end of file From d1562b272f25130fac386d7ae2c2967f979de307 Mon Sep 17 00:00:00 2001 From: nourelsakhey <36204564+nourelsakhey@users.noreply.github.com> Date: Sun, 1 Mar 2020 21:06:53 +0200 Subject: [PATCH 10/13] Add files via upload --- src/CircleCircumference.java | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 src/CircleCircumference.java diff --git a/src/CircleCircumference.java b/src/CircleCircumference.java new file mode 100644 index 0000000..5d829d1 --- /dev/null +++ b/src/CircleCircumference.java @@ -0,0 +1,27 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ + + +/** + * + * @author Nour-Alhoda Khalid + */ +public class CircleCircumference implements ISubscriber { + + public CircleCircumference() { + + } + + @Override + public void notifySubscriber(String input){ + double x= Double.parseDouble(input); + double y=2*3.14*x; + System.out.print("the circumference equals "); + System.out.println(y); + } + + +} From 79837a350940eb144a629e949b46062b778790b4 Mon Sep 17 00:00:00 2001 From: Mostafa2369 Date: Sun, 1 Mar 2020 21:07:40 +0200 Subject: [PATCH 11/13] Mostafa Mohamed 20140272 SummationSeries --- src/SummationSeries.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/SummationSeries.java b/src/SummationSeries.java index 8677cd4..254e3f8 100644 --- a/src/SummationSeries.java +++ b/src/SummationSeries.java @@ -1,6 +1,7 @@ public class SummationSeries implements ISubscriber { - public SummationSeries() {} + public SummationSeries() { +} int factorial(int t) { From 112f8c400859b4865af40565171c08e29bfe322a Mon Sep 17 00:00:00 2001 From: Abdelrahman Hesham Shaker Date: Mon, 2 Mar 2020 01:18:41 +0200 Subject: [PATCH 12/13] adding MultiplicationSeries --- src/Main.java | 3 ++- src/MultiplicationSeries.java | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 src/MultiplicationSeries.java diff --git a/src/Main.java b/src/Main.java index b10534d..b4144d9 100644 --- a/src/Main.java +++ b/src/Main.java @@ -9,7 +9,8 @@ public class Main { new CircleCircumference(), new SphereVolume(), - new SummationSeries() + new SummationSeries(), + new MultiplicationSeries() diff --git a/src/MultiplicationSeries.java b/src/MultiplicationSeries.java new file mode 100644 index 0000000..3f4d1ec --- /dev/null +++ b/src/MultiplicationSeries.java @@ -0,0 +1,14 @@ +import java.math.BigDecimal; + +public class MultiplicationSeries implements ISubscriber { + + @Override + public void notifySubscriber(String input) { + BigDecimal output=new BigDecimal("1"); + for (int i = Integer.parseInt(input); i > 0; i--) { + output=output.multiply(BigDecimal.valueOf(i)); + } + System.out.println("MultiplicationSeries : "+output); + } + +} From de378e8adcb823cef717d0523e515c98215432c2 Mon Sep 17 00:00:00 2001 From: moataz1996 Date: Mon, 2 Mar 2020 19:16:42 +0200 Subject: [PATCH 13/13] Circle Area 20150262 --- src/CircleArea.java | 12 ++++++++++++ src/Main.java | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 src/CircleArea.java diff --git a/src/CircleArea.java b/src/CircleArea.java new file mode 100644 index 0000000..7f00609 --- /dev/null +++ b/src/CircleArea.java @@ -0,0 +1,12 @@ +import java.util.Scanner; + +public class CircleArea implements ISubscriber +{ + @Override + public void notifySubscriber(String input){ + int r = Integer.parseInt(input); + double pi = 3.14, area; + area = pi * r * r; + System.out.println("Area of circle: "+ area); + } +} \ No newline at end of file diff --git a/src/Main.java b/src/Main.java index b4144d9..40a52b0 100644 --- a/src/Main.java +++ b/src/Main.java @@ -10,7 +10,8 @@ public class Main { new CircleCircumference(), new SphereVolume(), new SummationSeries(), - new MultiplicationSeries() + new MultiplicationSeries(), + new CircleArea()