From 875e9684c653f67fdb9e1814bd77cfbef36372c7 Mon Sep 17 00:00:00 2001 From: LamyaRaed Date: Fri, 28 Feb 2020 14:08:18 +0200 Subject: [PATCH 01/22] MultiplicationSeries Implementation --- .idea/misc.xml | 6 + .idea/modules.xml | 8 + .idea/vcs.xml | 6 + .idea/workspace.xml | 267 ++++++++++++++++++ git_assignment_initial.iml | 11 + .../git_assignment_initial/ISubscriber.class | Bin 0 -> 154 bytes .../git_assignment_initial/Main.class | Bin 0 -> 1153 bytes .../MultiplicationSeries.class | Bin 0 -> 1453 bytes .../ReallySimpleSubscriber.class | Bin 0 -> 1081 bytes .../SimpleSubscriber.class | Bin 0 -> 1056 bytes .../git_assignment_initial/Topic.class | Bin 0 -> 1158 bytes src/Main.java | 1 + src/MultiplicationSeries.java | 23 ++ 13 files changed, 322 insertions(+) create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml create mode 100644 git_assignment_initial.iml create mode 100644 out/production/git_assignment_initial/ISubscriber.class create mode 100644 out/production/git_assignment_initial/Main.class create mode 100644 out/production/git_assignment_initial/MultiplicationSeries.class create mode 100644 out/production/git_assignment_initial/ReallySimpleSubscriber.class create mode 100644 out/production/git_assignment_initial/SimpleSubscriber.class create mode 100644 out/production/git_assignment_initial/Topic.class create mode 100644 src/MultiplicationSeries.java diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6e2d158 --- /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..81c2cd4 --- /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/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..8d4717d --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,267 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + @@ -166,87 +87,21 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/out/production/git_assignment_initial/ISubscriber.class b/out/production/git_assignment_initial/ISubscriber.class index 1b2e4df106c97d998761daee094188476da0aebe..15f67e7c9591b307e032dcdb72efbf6746991658 100644 GIT binary patch delta 88 zcmbQmIEzu>)W2Q(7#JAL893P)*x4C4CK`I%Gcs^{2A3ukCl_TVr4}(V2xKLeCF3zjJ%dY=ij#{nlTwS=8CVz@1hNv#67_Qu^V0SG mld@8iOC}0<%ds&sFfuR$wJ|U-0@biGuz^?%>_C!YuW6g`jmf?-;qmQt(*ZBeOEp|!M?)_zz&ih?etG0wupFqxRw(1FmwZDV5G z6aIj4Od`pk>@{1QoCzch+{O+=Y~Oxi7dk#~6imnV zJh!dkj)A+lCra)c*hR&_13Y91SIkcR&}s9!+h&NG{Giov|A%_-S(18>*E$WKw;J5B zectp;x6R!{27QOOorb&Jc5Mc^W^<1yhP@lM_q_19zVAAI_w{V|TXBkEGFu(q@n)go zwK~4(Q{BNDsmildZ;xeDxJ1i~(^83A$RQ*VCY5xa@1>=QqbZ81Yg% zLP+DH$R+%hGE}l#0|cxSNY!H+F@L%tEz5Cv`Yq!5xV%_aa!I8R<(16do&6j@wT_{k zAXv-y5qgxH??eAU91=v|83d2Wgb}2+DU2XP_8KB6(c_g7!zMkR7-|U$-K!*Lh7gT_ zS;_^~t>QAS(10akxr(g#50p1YED~~*kwD;#NE8iu4FL`FjHLdia1htU7M>2J?G9Oi yqV^eKOB%o+fg`3R4=_q7Vp_@oQ9?1(QU@3#bk6(;Sx8|+DgRa|lUJZv0L8z57kJD7 delta 681 zcmYjOO>YuW6g}_F438Pc7L<{qmTEgzzUs8KR9lhytxZH1W16rW2#aTs5(;jKNnM*} z{y^i#wKai6Vt;^c{2wMJ?p#^#!-a0{J@>r(-Z}TaL-Vzn`ttkJF@OzhTj0^I+xDAX+1#_>K|6T+Q!filhx^POka&zX129->R6-hI+7ZQ7syxb! zvXLKweIUSbjiNeMt!otRzYQp1ohlR8af29j`73oqDBm7K)J8C$9KosqgnWN4OsAN`WQt*SN)nXhDT_{{|HO@Xa6lu Lr|J=L8pq>5Ma*T! diff --git a/out/production/git_assignment_initial/MultiplicationSeries.class b/out/production/git_assignment_initial/MultiplicationSeries.class index 9cae5dd73cc0ad8fd83f1ba0031a57856cb182ae..95625e5d8bfba6fa9d7fd50a9a5a556a7d4e1584 100644 GIT binary patch delta 669 zcmYLG%Wl(95Iti%xru9%ke0M1&<5xu4s ziY`08p$k|P6eJ|J-SG*00$U^yb6W*uY0lg;b7#&y-W}N;S=;|J_zK`E9-1&wO5+qx z=b4x@F^{r|3aTd3sO3R8r?~S1b%6^43xwpd=X>!AK`&RH$bH(#o9n$!yy=FX8xf4M zU9shaw$%SwkQ-Wa$AX0;0v9b@!ev74P7uUV96H@~H+~U3i?T^9rf|h#IoAZPTUbI- z;D&`|+_W%?u@qKR@s@?#C=$lhHm}?9+D_~R{%~(@+j-^GJC6Un{{_gjC^OzQC5C2iaV;S3WL8aj-kLSz+(933h+~XP>suVCs+bPpKhZ0_2tFw6ZmyeD=Z63`IfNC~W9)%#*bWKBa_U>zBbtUwN7Pq0{uA>1_Y z%~H#>Z%UW7rd97U1glrQnp5vIYF5WREh{?mD0oBZ*nK>7Ka(0q(NEg)6e$zu*rq)$ z+U?uk9fPRaw$(XmnT}&QUQv2hId&M*URg@Z3<=`I15!}vE(T6FNyM}(p-!qq%!rlz zJJ`#p93=G3zEu#4u>m1Wl46)bn9y%NA%{d9dWBRNKnC70@gJg(iYm?o4fd0avHLHH g`Vc{svSdtCRl*Fd14?GtKpC5eVV<-`I!15d7aq4a)Bpeg delta 492 zcmYLG%TB^j5Is|rTWVDVMe%_zkcW@@iiy#<@D(u{Nl4fiZLo+fX{%d*zzylr_z`NN z(S;x2PxvRsDH>heIWu?8oI5l3ReqKCKfd1H0jy(HfrOAihl);w3DLTKt!oY4s%al&`W zA|d0qq)b>~nUG>Pb;H9R+4jX%6O$O^#SoG_U4XnCwj&&AjKtVkcmX}M)1z#IbU+!Z=5S2_)DC#e2+<7`q=KX5Y{aJfrVVq=eu%0xcDyt(5p-|0;1EH#WsuAxtw* XLK+!HnQvzJ%wd5eg*^>RSV8g|Ze&g@ diff --git a/out/production/git_assignment_initial/SimpleSubscriber.class b/out/production/git_assignment_initial/SimpleSubscriber.class index 96eb5b52ffd095683557f3cef358dd5e68df7094..c01c76bfd0d6a1762edde1f33e0a047b1b836ac3 100644 GIT binary patch delta 437 zcmYLFJx{_=6g{sMUMWQpwF;M1VAc6%YH3YEQo%Y>9BBm^1Q~)Ad6U1a*7aJ4!CxL5?6aarMix2eLpZb_kL{nh#IfP#7MuY~ zMLD)6Q}_p1mA93`r*@B%Okoct8Rkx{!g>bpkPMO(>Jf z6Ek8@_8shH*!B~;X4k3^DkB2|m?Xt8g&?6jTq1`+9C(G0>q7+IFfk61hfR)i_nX`# lb>#j}qB%?>L|Gzcs4HNW)&V6mY@&!Qgt0(cA|0j|`2)kwJ?;Pi delta 475 zcmYLFO)mpc6g_XI=1s?x)<>z2QlHZnqliR&L^LE#DkKeCnKEIJ8JQWj{Q(vtZ)52X zNU$L3!qUQz5_b?5@0@qvJ@>qO@4b4jZhd?<-vBIOL4yRDBc`JT3PbYLy0Xl3%RM%C z>ZkT$$e^q^t`n{?$VPrY4i#|@O-CzqvByeU2l=$=Xh%}KvvNX12Rb>rbaW#v;?i(G zL$^`=x2=V~;~p>P_c?k+j&-Iu`WRX(waa>N=sR`Wzg;}IeOMo(W;Q%83_{no}&s#k9C)t4Y1$y0%|Fw}QY9IA%pkHWZFI zhOBs!dPvI~G+Wj4&Mq&ILl5nNAw$DNOuHcLr^qB`#4Uwau&3|z0AZAlq=SU|j{sQ= zQN%EeG+|V{NeYQL@eE#UA_2T0^=Gn+X!!sq2ld-2{iFVMqB?49guG;ol1{=H#)(yW RnV>U;8HzNznJ8f%nJ=f-Moja2yjWT)@0AztFuQM2dNQ~p5VLb@0`Z5<8tVp2(sNfjui0ePsWj-xl$uqivF7+v z**#}GSeGQBmsXoCStVM^snwzeq-P&!s5->RpNR+j0t0n7hzg0Bv2%yG6MpiD^XNdS znrye6pt}Be)Aa&@5xa}iaJ+h<9Qe|!7Zs0$^jaOpGe^UuR}P%&t7WGZ4yxm-fKhIC z{HpszDm9F7;02|wuy*Gr7vpC1TQ}mk9{=m>N{X3lNJY5=Q{sTB1>QDdx literal 1158 zcmZuw+fEZv6kVqmhEAuY7AW2jP?Tx8)VpF4yeA|DA4)LtHf_gpuuhxl43THQ!Y}Yu z6P2Ke@!1dYBaBhknHJlkFXyt)-fOLWIp2PL`T}4PcXWgh)(|le#ehI+$J({>b<3&c zAD4IRiYG9zBpvB33xv(=riMX*;lRoFWIcb^b*;UkY;w zWT9A}EfsOzzy-_*M4Z4pa){llTtk+1S?$V=!^EtCIn1*{PQ#PW_PUQpvM+hAbZUj{ zra-JDYmVjlt}QTeB-y264}M{}Kt=Z(RXPq8rDL!AFW8R_t6ZlgU2IgW`ljVdb?+D> z-nL}Fv|`Xkh9}sFUQsEtk3s1PxBN04`|JW!hb0JRMm7CkZHcOEH7&2Q{czWISk0(( znm+e*Pun|*lc3~TmFH_#vm;e6HGH>XKawgLJP=n1kr7$1dfv7@!OG5}smP!Ep zKwUY}4oo}IMZVv{JXZzsict~nX6_?02RJFPHg|wC0KoK<3{hOcbz0-rKaY2|uB0nE1i3C$LOY2rGX8 Dd0XrY diff --git a/src/Main.java b/src/Main.java index 1c89886..cf8aa55 100644 --- a/src/Main.java +++ b/src/Main.java @@ -4,7 +4,8 @@ public class Main { private static ISubscriber subscribers [] = { new SimpleSubscriber(), new ReallySimpleSubscriber(), - new MultiplicationSeries() + new MultiplicationSeries(), + new CircleArea() }; public static void main(String[] args) { Topic mathTopic = new Topic(); From 069f7fac3bc61ff24a02eaf688f7bdf6c0ffe271 Mon Sep 17 00:00:00 2001 From: MaiMostafa <36239156+MaiMostafa99@users.noreply.github.com> Date: Fri, 28 Feb 2020 16:31:03 +0200 Subject: [PATCH 09/22] Update MultiplicationSeries.java --- src/MultiplicationSeries.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MultiplicationSeries.java b/src/MultiplicationSeries.java index 6fbcfb8..c6b614f 100644 --- a/src/MultiplicationSeries.java +++ b/src/MultiplicationSeries.java @@ -18,6 +18,6 @@ public int MultSeries(int N){ @Override public void notifySubscriber(String input) { System.out.print("Hello, I am a multiplication series and I am notified with " + input); - System.out.println("and my result is : " + MultSeries(Integer.parseInt(input))); + System.out.println(" and my result is : " + MultSeries(Integer.parseInt(input))); } } From 7c02f0c950847bce18257447b9fb44d81bf6b0c7 Mon Sep 17 00:00:00 2001 From: karimsalah270 <36330452+karimsalah270@users.noreply.github.com> Date: Fri, 28 Feb 2020 16:36:47 +0200 Subject: [PATCH 10/22] Add files via upload --- SphereVolume.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 SphereVolume.java diff --git a/SphereVolume.java b/SphereVolume.java new file mode 100644 index 0000000..619c7fb --- /dev/null +++ b/SphereVolume.java @@ -0,0 +1,13 @@ + +public class SphereVolume implements ISubscriber{ + + @Override + public void notifySubscriber(String input) { + // TODO Auto-generated method stub + double radius = Double.parseDouble(input); + double Volume = (4*22*radius*radius*radius) / (3*7); + System.out.println("Volume=" + Volume); + } + +} + From d9017f0fe9a004674acefcadc8866a12b975ddc0 Mon Sep 17 00:00:00 2001 From: karimsalah270 <36330452+karimsalah270@users.noreply.github.com> Date: Fri, 28 Feb 2020 16:38:21 +0200 Subject: [PATCH 11/22] Delete SphereVolume.java --- SphereVolume.java | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 SphereVolume.java diff --git a/SphereVolume.java b/SphereVolume.java deleted file mode 100644 index 619c7fb..0000000 --- a/SphereVolume.java +++ /dev/null @@ -1,13 +0,0 @@ - -public class SphereVolume implements ISubscriber{ - - @Override - public void notifySubscriber(String input) { - // TODO Auto-generated method stub - double radius = Double.parseDouble(input); - double Volume = (4*22*radius*radius*radius) / (3*7); - System.out.println("Volume=" + Volume); - } - -} - From f077ea5c432419e1d72970f3ae8b3eec7d0b755b Mon Sep 17 00:00:00 2001 From: karimsalah270 <36330452+karimsalah270@users.noreply.github.com> Date: Fri, 28 Feb 2020 16:38:56 +0200 Subject: [PATCH 12/22] Add files via upload --- src/SphereVolume.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/SphereVolume.java diff --git a/src/SphereVolume.java b/src/SphereVolume.java new file mode 100644 index 0000000..619c7fb --- /dev/null +++ b/src/SphereVolume.java @@ -0,0 +1,13 @@ + +public class SphereVolume implements ISubscriber{ + + @Override + public void notifySubscriber(String input) { + // TODO Auto-generated method stub + double radius = Double.parseDouble(input); + double Volume = (4*22*radius*radius*radius) / (3*7); + System.out.println("Volume=" + Volume); + } + +} + From 863ab584747ed704991d5f81f9fe9d9c12082089 Mon Sep 17 00:00:00 2001 From: karimsalah270 <36330452+karimsalah270@users.noreply.github.com> Date: Fri, 28 Feb 2020 16:39:57 +0200 Subject: [PATCH 13/22] Update Main.java --- src/Main.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Main.java b/src/Main.java index 1c89886..cd1b351 100644 --- a/src/Main.java +++ b/src/Main.java @@ -4,7 +4,8 @@ public class Main { private static ISubscriber subscribers [] = { new SimpleSubscriber(), new ReallySimpleSubscriber(), - new MultiplicationSeries() + new MultiplicationSeries(), + new SphereVolume() }; public static void main(String[] args) { Topic mathTopic = new Topic(); From 72c2c4aeb77f8304019a9c017a4afdea6a79dce5 Mon Sep 17 00:00:00 2001 From: beamerboi1998 Date: Fri, 28 Feb 2020 20:36:28 +0200 Subject: [PATCH 14/22] Create fibonnachi.java --- src/fibonnachi.java | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 src/fibonnachi.java diff --git a/src/fibonnachi.java b/src/fibonnachi.java new file mode 100644 index 0000000..991c7a9 --- /dev/null +++ b/src/fibonnachi.java @@ -0,0 +1,28 @@ + +/* fibonnachi series + name: omar mahmoud salah + id:20160163 +*/ + +public class fibonnachi implements isubscriber{ + +public void fibbseries(int N){ + int x1=0,x2=1,x3,count=10; + System.out.print(x1+"- "x2); + + for(int i=2;i Date: Fri, 28 Feb 2020 20:47:12 +0200 Subject: [PATCH 15/22] create sphere area class --- src/Main.java | 3 ++- src/SphereArea.java | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 src/SphereArea.java diff --git a/src/Main.java b/src/Main.java index 1c89886..6251a81 100644 --- a/src/Main.java +++ b/src/Main.java @@ -4,7 +4,8 @@ public class Main { private static ISubscriber subscribers [] = { new SimpleSubscriber(), new ReallySimpleSubscriber(), - new MultiplicationSeries() + new MultiplicationSeries(), + new SphereArea() }; public static void main(String[] args) { Topic mathTopic = new Topic(); diff --git a/src/SphereArea.java b/src/SphereArea.java new file mode 100644 index 0000000..8a48267 --- /dev/null +++ b/src/SphereArea.java @@ -0,0 +1,18 @@ + +public class SphereArea implements ISubscriber{ + + + public float SArea(float R){ + float result; + result=4*(float)(22.0/7.0)*(R*R); + return result; + } + + @Override + public void notifySubscriber(String input){ + System.out.println("Hello, I am a Sphere Area and I am notified with " + input); + System.out.println(" and my result is : " + SArea(Integer.parseInt(input))); + } +} + + From 06907374baff2b3982b460850b73885872210b3f Mon Sep 17 00:00:00 2001 From: beamerboi1998 Date: Sun, 1 Mar 2020 19:16:18 +0200 Subject: [PATCH 16/22] Delete fibonnachi.java --- src/fibonnachi.java | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 src/fibonnachi.java diff --git a/src/fibonnachi.java b/src/fibonnachi.java deleted file mode 100644 index 991c7a9..0000000 --- a/src/fibonnachi.java +++ /dev/null @@ -1,28 +0,0 @@ - -/* fibonnachi series - name: omar mahmoud salah - id:20160163 -*/ - -public class fibonnachi implements isubscriber{ - -public void fibbseries(int N){ - int x1=0,x2=1,x3,count=10; - System.out.print(x1+"- "x2); - - for(int i=2;i Date: Sun, 1 Mar 2020 19:16:25 +0200 Subject: [PATCH 17/22] Create fibonnachi_series.java --- src/fibonnachi_series.java | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 src/fibonnachi_series.java diff --git a/src/fibonnachi_series.java b/src/fibonnachi_series.java new file mode 100644 index 0000000..f3eed3d --- /dev/null +++ b/src/fibonnachi_series.java @@ -0,0 +1,27 @@ + + + +/* fibonnachi series + name: omar mahmoud salah + id:20160163 +*/ + +public class fibonnachi_series implements ISubscriber{ + + static int fibb(int N) + { + if (N <= 1) + return N; + else{ + + return fibb(N - 1) + fibb(N- 2);}; + } + + public void notifySubscriber(String input) { + + System.out.print("Hello, I am fibonnachi series and I am notified with " + input); + + System.out.println(" and my result is : " + fibb(Integer.parseInt(input))); + } +} + From 2be23516178d0790b83de8fac9b1f4e4de565baf Mon Sep 17 00:00:00 2001 From: okhaled9 <36415286+okhaled9@users.noreply.github.com> Date: Sun, 1 Mar 2020 23:56:06 +0200 Subject: [PATCH 18/22] Add files via upload --- src/SummationSeries.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 src/SummationSeries.java diff --git a/src/SummationSeries.java b/src/SummationSeries.java new file mode 100644 index 0000000..15d3922 --- /dev/null +++ b/src/SummationSeries.java @@ -0,0 +1,19 @@ +/* +Name: Omar Khaled Ali +ID: 20170374 +*/ +public class SummationSeries implements ISubscriber{ + private int Sum (int num){ + int sum = 0; + for(int i=1 ; i<=num ; i++){ + sum += i; + } + return sum; + } + + @Override + public void notifySubscriber(String input) { + System.out.print("Hello, I am Summation series and I am notified with: " + input); + System.out.println("result: " + Sum(Integer.parseInt(input))); + } +} From 208ef4639b15374253df7841da57e14c024f3e69 Mon Sep 17 00:00:00 2001 From: ahmedramadan11 Date: Mon, 2 Mar 2020 22:01:45 +0200 Subject: [PATCH 19/22] sloving conflics --- .idea/$PRODUCT_WORKSPACE_FILE$ | 19 ++++ .idea/codeStyles/codeStyleConfig.xml | 5 + .idea/misc.xml | 2 +- .idea/workspace.xml | 99 ++++++++-------- git_assignment_initial.iml | 2 +- .../git_assignment_initial/.classpath | 6 + .../git_assignment_initial/.gitignore | 56 +++++++++ .../.idea/$PRODUCT_WORKSPACE_FILE$ | 19 ++++ .../.idea/codeStyles/codeStyleConfig.xml | 5 + .../git_assignment_initial/.idea/misc.xml | 6 + .../git_assignment_initial/.idea/modules.xml | 8 ++ .../git_assignment_initial/.idea/vcs.xml | 6 + .../.idea/workspace.xml | 107 ++++++++++++++++++ .../git_assignment_initial/.project | 17 +++ .../git_assignment_initial/ISubscriber.class | Bin 154 -> 0 bytes .../git_assignment_initial/Main.class | Bin 1184 -> 0 bytes .../MultiplicationSeries.class | Bin 1453 -> 0 bytes .../ReallySimpleSubscriber.class | Bin 1081 -> 0 bytes .../SimpleSubscriber.class | Bin 1056 -> 0 bytes .../git_assignment_initial/Topic.class | Bin 1158 -> 0 bytes .../git_assignment_initial.iml | 11 ++ .../src/CircleVolum.class | Bin 0 -> 936 bytes .../src/ISubscriber.class | Bin 0 -> 158 bytes .../git_assignment_initial/src/Main.class | Bin 0 -> 1238 bytes .../src/MultiplicationSeries.class | Bin 0 -> 1195 bytes .../src/ReallySimpleSubscriber.class | Bin 0 -> 810 bytes .../src/SimpleSubscriber.class | Bin 0 -> 785 bytes .../src/SphereArea.class | Bin 0 -> 1069 bytes .../src/SphereVolume.class | Bin 0 -> 925 bytes .../src/SummationSeries.class | Bin 0 -> 1155 bytes .../git_assignment_initial/src/Topic.class | Bin 0 -> 1186 bytes .../src/fibonnachi_series.class | Bin 0 -> 1116 bytes .../src/twoPowerN.class | Bin 0 -> 669 bytes src/CircleVolum.java | 2 + src/ISubscriber.java | 1 + src/Main.java | 60 ++++------ src/MultiplicationSeries.java | 26 +---- src/ReallySimpleSubscriber.java | 1 + src/SimpleSubscriber.java | 2 +- src/SphereArea.java | 4 +- src/SphereVolume.java | 4 +- src/SummationSeries.java | 3 +- src/Topic.java | 2 + src/fibonnachi_series.java | 28 +++-- src/twoPowerN.java | 5 +- twoPowerN.java | 10 -- 46 files changed, 361 insertions(+), 155 deletions(-) create mode 100644 .idea/$PRODUCT_WORKSPACE_FILE$ create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 out/production/git_assignment_initial/.classpath create mode 100644 out/production/git_assignment_initial/.gitignore create mode 100644 out/production/git_assignment_initial/.idea/$PRODUCT_WORKSPACE_FILE$ create mode 100644 out/production/git_assignment_initial/.idea/codeStyles/codeStyleConfig.xml create mode 100644 out/production/git_assignment_initial/.idea/misc.xml create mode 100644 out/production/git_assignment_initial/.idea/modules.xml create mode 100644 out/production/git_assignment_initial/.idea/vcs.xml create mode 100644 out/production/git_assignment_initial/.idea/workspace.xml create mode 100644 out/production/git_assignment_initial/.project delete mode 100644 out/production/git_assignment_initial/ISubscriber.class delete mode 100644 out/production/git_assignment_initial/Main.class delete mode 100644 out/production/git_assignment_initial/MultiplicationSeries.class delete mode 100644 out/production/git_assignment_initial/ReallySimpleSubscriber.class delete mode 100644 out/production/git_assignment_initial/SimpleSubscriber.class delete mode 100644 out/production/git_assignment_initial/Topic.class create mode 100644 out/production/git_assignment_initial/git_assignment_initial.iml create mode 100644 out/production/git_assignment_initial/src/CircleVolum.class create mode 100644 out/production/git_assignment_initial/src/ISubscriber.class create mode 100644 out/production/git_assignment_initial/src/Main.class create mode 100644 out/production/git_assignment_initial/src/MultiplicationSeries.class create mode 100644 out/production/git_assignment_initial/src/ReallySimpleSubscriber.class create mode 100644 out/production/git_assignment_initial/src/SimpleSubscriber.class create mode 100644 out/production/git_assignment_initial/src/SphereArea.class create mode 100644 out/production/git_assignment_initial/src/SphereVolume.class create mode 100644 out/production/git_assignment_initial/src/SummationSeries.class create mode 100644 out/production/git_assignment_initial/src/Topic.class create mode 100644 out/production/git_assignment_initial/src/fibonnachi_series.class create mode 100644 out/production/git_assignment_initial/src/twoPowerN.class delete mode 100644 twoPowerN.java diff --git a/.idea/$PRODUCT_WORKSPACE_FILE$ b/.idea/$PRODUCT_WORKSPACE_FILE$ new file mode 100644 index 0000000..3733e0d --- /dev/null +++ b/.idea/$PRODUCT_WORKSPACE_FILE$ @@ -0,0 +1,19 @@ + + + + + + + 1.8 + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..a55e7a1 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 0319d5d..6a46f48 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 0734907..82ae97e 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,16 +1,29 @@ - + - - - - - - + + + + + + + + + + + + + + + + + + + - - - - + + - - + + + - - - - + + + + + + + + + - - - 1582886226964 + + 1583176489308 - - - - - - - - - 13 - - - - - - - \ No newline at end of file diff --git a/git_assignment_initial.iml b/git_assignment_initial.iml index c90834f..b107a2d 100644 --- a/git_assignment_initial.iml +++ b/git_assignment_initial.iml @@ -3,7 +3,7 @@ - + diff --git a/out/production/git_assignment_initial/.classpath b/out/production/git_assignment_initial/.classpath new file mode 100644 index 0000000..fceb480 --- /dev/null +++ b/out/production/git_assignment_initial/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/out/production/git_assignment_initial/.gitignore b/out/production/git_assignment_initial/.gitignore new file mode 100644 index 0000000..539bdba --- /dev/null +++ b/out/production/git_assignment_initial/.gitignore @@ -0,0 +1,56 @@ +.metadata +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.recommenders + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# PyDev specific (Python IDE for Eclipse) +*.pydevproject + +# CDT-specific (C/C++ Development Tooling) +.cproject + +# CDT- autotools +.autotools + +# Java annotation processor (APT) +.factorypath + +# PDT-specific (PHP Development Tools) +.buildpath + +# sbteclipse plugin +.target + +# Tern plugin +.tern-project + +# TeXlipse plugin +.texlipse + +# STS (Spring Tool Suite) +.springBeans + +# Code Recommenders +.recommenders/ + +# Annotation Processing +.apt_generated/ +.apt_generated_test/ + +# Scala IDE specific (Scala & Java development for Eclipse) +.cache-main +.scala_dependencies +.worksheet \ No newline at end of file diff --git a/out/production/git_assignment_initial/.idea/$PRODUCT_WORKSPACE_FILE$ b/out/production/git_assignment_initial/.idea/$PRODUCT_WORKSPACE_FILE$ new file mode 100644 index 0000000..3733e0d --- /dev/null +++ b/out/production/git_assignment_initial/.idea/$PRODUCT_WORKSPACE_FILE$ @@ -0,0 +1,19 @@ + + + + + + + 1.8 + + + + + + + + \ No newline at end of file diff --git a/out/production/git_assignment_initial/.idea/codeStyles/codeStyleConfig.xml b/out/production/git_assignment_initial/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..a55e7a1 --- /dev/null +++ b/out/production/git_assignment_initial/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/out/production/git_assignment_initial/.idea/misc.xml b/out/production/git_assignment_initial/.idea/misc.xml new file mode 100644 index 0000000..6a46f48 --- /dev/null +++ b/out/production/git_assignment_initial/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/out/production/git_assignment_initial/.idea/modules.xml b/out/production/git_assignment_initial/.idea/modules.xml new file mode 100644 index 0000000..81c2cd4 --- /dev/null +++ b/out/production/git_assignment_initial/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/out/production/git_assignment_initial/.idea/vcs.xml b/out/production/git_assignment_initial/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/out/production/git_assignment_initial/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/out/production/git_assignment_initial/.idea/workspace.xml b/out/production/git_assignment_initial/.idea/workspace.xml new file mode 100644 index 0000000..a44e0e0 --- /dev/null +++ b/out/production/git_assignment_initial/.idea/workspace.xml @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1583176489308 + + + + + + + \ No newline at end of file diff --git a/out/production/git_assignment_initial/.project b/out/production/git_assignment_initial/.project new file mode 100644 index 0000000..a91a890 --- /dev/null +++ b/out/production/git_assignment_initial/.project @@ -0,0 +1,17 @@ + + + GitAssignmentObserver + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/out/production/git_assignment_initial/ISubscriber.class b/out/production/git_assignment_initial/ISubscriber.class deleted file mode 100644 index 15f67e7c9591b307e032dcdb72efbf6746991658..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmX^0Z`VEs1_pBmPId-%b_Nbc27$c%lFYQq;L@bx$t7%z42%p+ YK-(D@7+Dw@m>F0=ECyB}$;7}00Ekc~ivR!s diff --git a/out/production/git_assignment_initial/Main.class b/out/production/git_assignment_initial/Main.class deleted file mode 100644 index 1760de0806ecd3990b9cbdd2707262c1d5044769..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1184 zcmZuw+foxj5IvLKWXZDJiHLXc7OoKlQ9w`;6b)GAQdFgQ8kQ{>+-y>tjiv8?i7!5j zRZwM0KR`dlAMi;%6DSG7%k=4<>C@e3X1@Ra@(sWw@-{LUwJ>HQfzdR&aYv(Z3lnMF z#iWfC?&;;e4o_K_wlHJE(K!!nv}!wRqg~rM8=cxdwD3rvxl-Mzc#+!hql!T5dVb0M z7nl}E&8SetvjRr8e@(!gFKzk)ZFv>?E7c;CR^>*(NN2v}$zV-JO8bXFGu~DtP34!R z3Q1-bX$8(?*Yi8_jm!ly+{(Feq{6Lf&2F$4ftLSTFlDqwmabEh1kyzrZ?Bfh$`i2i zb-+T23f-=QBGp(0IoFe6=tta2s<2#*b;BoGU}-m&-s@#qt`A`0x`iHrrWr3dRKa#j z)yVS~m7Y1R#~RTz4$h*N-1Yhn&Y;J^W6TS5)QdE>VBv{_1uW{6rw*QB$-#5H;6*eD zFVOC)Vma`S?t-$t@?{XbJGs%lTn%DX4wNTjRSI1{Qa%N<=T+nd{-em3lwS8r+M}Ug zZtVCTg=mqRn~i1Kv&Zz;_tKE%zN^H3kqT?J%z=iglv~oG@+N&*q{e5nr*70AQ0Tv9 z(e7;jsrqlKN?FF<_QD%K7>@dGkL8FOqZ zIoO-rL-M^TKK}VxL#nU~YadO^LwiWC3=Z$X)^&|~-99uCH*LeF zV2=M$_cV?q_fs6NkBA-M8qb1x_izI@+1~_NZXv6`IM4Ny#lRp>^dRwvBuNWH77`YQ z1;_uza1%!Usq(B&3f#87qPbwy;BdSaw_w)LO4Q~Sk~Opwb-0C84V^???q`^K5YZr@ LNiWA(0=NGHQK%W@M(6g@4;8d;3rmI<*censAgJF zTCmGUWY2;P8?qoNFY*C=4=bt&oF1uSxhzsDb>F^yALrbAr(gbi@(+No@IxMXc!T&D zpNvznkjH0O%wq}5c?@D@90FIYZp}f_!Bq#>1hVTo&}LI0y|{E=AX5$xl)y+;2Wqd? z*jLd#x$jdmUJdKgzb_+g&s}B49O+nKs=C|qjc)q7E{zU@nu@fFO9FYT@0=KVv9eSV z5So9x?=iUy;zueH7^)drKi-wiZs5@%H2Sx8t+gN5BTWQ(8MN^&0S@V!h?7u zi!XDy;j+dz9o%wp8`BO-F4nQ(Vgi#nY}(5^F22UJz+}HnjC+dk$NdMYPSh7Fy&QWC zYVFvl2HO%^a)k~#9TtBgaYOn_HcEMXgDrve9p(Gss#o!3!;@a)OfS4RX@)0*gN{K` zS*;GdN7@{DLf~RU9;zmoSW^F%`IEIM|kX|W27ozkuZMjhI2 z=9)5!6_4*}EC*!LLTDaq%;TAYX{V+I5Ha~DswypS1VD2=p4jzWbsyj9v zuG_M1!l>o}Iq1M1P7alF@V zsy^nw^w@W1qtwf?8=@?Izov~UIrv^+{v5x4*aR;Bza5{8LB1QDMZOtn?)(8 diff --git a/out/production/git_assignment_initial/ReallySimpleSubscriber.class b/out/production/git_assignment_initial/ReallySimpleSubscriber.class deleted file mode 100644 index b8ce4c64cb294ed00c642bb88873a66655e51b28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1081 zcmaJ=U2hUW6g|V&Qo6NBg|=4fR%wN{7QYf7Fq%kgN`fDerat&Iz*wg2&XC=qhJWJU z&<9QW;1BRe8Sm~Ap(*i!8Sb5P&pr3d&hI}LzW_YL(;PA=E}(?f0wp$bxP{vmHZ9z- z;4oyKOC`+$pp{2XrJ>k9#<4H1Q`Z8cxYkd&h zb;oV#4PDV5b%L%hskF|JSK7$W<7tkeSZST{b6#_~I<2*hFV$&1Y@L>BI5J_UE5{7E zwjTLiaVSGA8}r*8gmpHuSg^2V<1X$||5sX@!1#RlMwq_t1so_ZkFxgLngt;O9BdDm!vY~e9|Of9VkqalOcR7&^_ zmj{6$Nnd9rO*rEFIHCz%5tQS?`c;`TnM;MoAocO>>MkOY1pH6_VKhZ!QUBBD|Zo)A$PuA@LyNvse_0yjtvh?wC4 R9^nA%Sfe;g@jCr({sjqV8<+q9 diff --git a/out/production/git_assignment_initial/SimpleSubscriber.class b/out/production/git_assignment_initial/SimpleSubscriber.class deleted file mode 100644 index c01c76bfd0d6a1762edde1f33e0a047b1b836ac3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1056 zcmaJ=+iuf95Ivil)6}IQB`xLBx{#KnEe$sbBqJV(s2V9;q*UdBr%kdn+t|C2y(!9{ z@Eh;|QXlvLJ_<38Ba$`|58n06oH=u5cK7$6i(deq<5>j+D~4pba>9_R>5gDnZb&8G4g8h}j(N)?PobgP+&kfcjO?*9Wx6tqVomAy zJ<%Mr!ge4j$z{kZZRF?S#K%x9H_rGuuXeP*jrlsl+OvE!2X2>=5AZUw2 z8L22V(F_%t^iNiW9IrLKOUwhT2VxbNn$i#>)HN5b>;zEgL&?{Fs^ z4a*7tP0Qh`69-2#lcM8%k*4b~hBcq}L`|zUHy_DGf1%;Z(9n104RhWAS4K@;R>olU zBb}bIupiCk5kqOxyj179C&othd z#7A&M9eN@x#fk2$%qh>M#N%OK%z=NJ!pA4&R;FBIiW>L4rZmE}@RVVDroVaG7&iWo z!xqx?q-cWloD#It-J>-}R+V-}dwTaL*tb!5k=6(tL2X*?7=R^QBa0py^0Y?DZwQf~ zed#+AdlyIoKaiS`@3;q H^xgUk!xIsm diff --git a/out/production/git_assignment_initial/Topic.class b/out/production/git_assignment_initial/Topic.class deleted file mode 100644 index 0f2df432b4d579d8462b9742f0313271ab723cc6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1158 zcmZWo+fEZv6kTW9GIVANwLtNPfPzfRrQUDF`z0YM_)vn;w`n_;gLT?Wr$nCp3ctWt zO;my=#%Djok1$4EXIdC8FK5oat-bczXMXa2yjWT)@0AztFuQM2dNQ~p5VLb@0`Z5<8tVp2(sNfjui0ePsWj-xl$uqivF7+v z**#}GSeGQBmsXoCStVM^snwzeq-P&!s5->RpNR+j0t0n7hzg0Bv2%yG6MpiD^XNdS znrye6pt}Be)Aa&@5xa}iaJ+h<9Qe|!7Zs0$^jaOpGe^UuR}P%&t7WGZ4yxm-fKhIC z{HpszDm9F7;02|wuy*Gr7vpC1TQ}mk9{=m>N{X3lNJY5=Q{sTB1>QDdx diff --git a/out/production/git_assignment_initial/git_assignment_initial.iml b/out/production/git_assignment_initial/git_assignment_initial.iml new file mode 100644 index 0000000..b107a2d --- /dev/null +++ b/out/production/git_assignment_initial/git_assignment_initial.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/out/production/git_assignment_initial/src/CircleVolum.class b/out/production/git_assignment_initial/src/CircleVolum.class new file mode 100644 index 0000000000000000000000000000000000000000..4b9e20dce8a166394dde2a62f64c9ac8ab185fcf GIT binary patch literal 936 zcmaJ<+iuf95IvhXw&NNa(u9V#TuKW#EsdcKmypsT8X-lB04WfON5?T`8^^XByHY;` z{sbOU1QH*>|L}^Kb%Gk&3d@?A-JO|p=Is9b{p|;UDt0yGu%clVx8!Hp)lW_O<=tOz zlP`L)s{J7^FSF=P=B+xaYi# z2VEz8V|88H$+vvlaywSY#d@+SMIZQ(;ZkcD+U6b)ZP)4eZakC$fj4JF(H)ejM7)3ofYT zrjRS5g^oPt6m06)LRG;79S`w{Vg7Xc=P`GCf|-)AcAn~ZjG8b{bkwn}fOdAUKzf`S zkU&qGz3Lt~Ht|oAn$r_cB{lpw(QziQ!lCnbb*>~d?Nnj=Xc##Ix*uO?R2*x>ee*Tx z7mTcDLmo{`V29fN&Nj*DdFWHXJ+6zk&z%%emrhAUVgD~dl-o=Sde z{VP(<0@5|9fJ{m18%E#g_iOSODBq#JJ4QCIjWAP^N6<&OFv7(Xs5~TUp+ZBJ05oh8 qpn$C+BU(>jMYM<|0?wd$t7%z c42%p+Ko>ADFtRW*Ff*`#SPZN{l8J#008^DH0{{R3 literal 0 HcmV?d00001 diff --git a/out/production/git_assignment_initial/src/Main.class b/out/production/git_assignment_initial/src/Main.class new file mode 100644 index 0000000000000000000000000000000000000000..5de94c4097241aee95f3be118c37bf876df7d86e GIT binary patch literal 1238 zcmZux%Tg0T6g{0xGRZJNctr4lPt+h_e1H!?9wI85;9@AMQkIKmn1aU1BsG~>y7x=m zxK^v6%9MV9eu_WfN<2MKfWoHl?bChlJ@?$6`SIuLcK~B3S;*t2iCY#DxS2&SZfkGM z#CR5WaMwZ__w;gK!xJVZO-xy^b<6_`9okM?$Z0!cpjpk~@4b`d_HUzp~ zmKvd3Ty*xqNrCi~3RE;LkSq+X2pIFVHBX?kqylfLS!Lj|T=j``mujx`S7fO4eh)OF z4aLM(oVP4hz=TGXR^UY8Woc8skwsqy>qRFDRj@v(D>6PfoxSq z8_Tu2a@kfK9B)`K(IC{bTdWx=zv#F!2)vL-DHYV4ktTnHia@&)N%wVG*5hVO44UW@ z$V|EZo+6f0Ylg1(Sn2+=y1nZ4itE?y6L%8rCqMA9lQmB-olZg=z$%Iblx>0uS&`Fg!8+is#%iEst jA4~6hW(zrAor5w^S^txUJ$2LwH5l!e3(uX0qE1%7#-n8RBJO zn_I0$)pTF*szsjBvQy*MHg|yWUUEnkux2or&d({gL(6Cuk;oyKxe?$R-WQ5AP}+`}@%#Q#X^En(Fq ziQ-e!vYdINWblT;jmC+x4X;zT!R>lCp;Lq~>&AibcMTl{6m_g%RmGZ)`!E<1GPiMP zxTZ%?hVYDnq2hs#hgjD!iIm*5q2rNEo;*uwhT%TrXVpEkMta0$cImi+$C4_Co^Lj& z@s5-(*_BQ>`R637PvV-qLG26kX4ACm3=5}eKcII{CE6JAoo&8IOz zt2|joHk3O8`$&@j#%K(8oKYlcu6GkKjtN>(SCFDnZhk}A3fZKxs;tdSze6lNv%C5> z$lm|?k^Vq|UrOC%=R{}FM3*bD( zH3WV^VeBX2FkFDqqq0vZ0g4wsA@CK!mq$=WLv4iT=x;-9BXTSdC1-B#Gqg6&wV`+7 iv3~JGJtisQvP?xwp5tBgf9wjR=_NXw;W9-7xbhcii3<+^ literal 0 HcmV?d00001 diff --git a/out/production/git_assignment_initial/src/ReallySimpleSubscriber.class b/out/production/git_assignment_initial/src/ReallySimpleSubscriber.class new file mode 100644 index 0000000000000000000000000000000000000000..0e9a2d11652717a685330492d02547876c1ec111 GIT binary patch literal 810 zcmZ`%+iuf95IvilQ)5UQl0wn~TPTq9<`>?I`T!E5QUs_$m3Z9POS{$jB40rHEO%F9ncdklXJ(G)=dW)+06fEi4I8}`^s!-K(?%7&Chi%3-XU?P+EVxlS19z~wery^12J`dKibCoh| zj?%<)Po&U#I#xlfnMf4N@dO8YWlIC?F$j`sL57XeR- z{<+|3F#=Ej%)mwHmzZJ_C4K%`W#`<%07C~m*tM|dU>_ZZ{{N*QB^I5$om@zdCT$t~ z@l|cEfX34_lL7sk$cWM{MNyIajs(j{HYozqw;|$KhCajob*e5YIiH>qn^{z9&(IkR zmw<%0T{Qf6MFuN2^>v6XtkAYG+@RH~kSE#6-lCgJo{_KbT!MWmo?B!aMX-uhIy)r* zYiQGrYN12cB%jctR>=3iqVgTp50|L5>oYWV>6^itp}AnR3#5e}ng#26nK@@A4s@|j LytD?ySi#-jdT+w+ literal 0 HcmV?d00001 diff --git a/out/production/git_assignment_initial/src/SimpleSubscriber.class b/out/production/git_assignment_initial/src/SimpleSubscriber.class new file mode 100644 index 0000000000000000000000000000000000000000..69431a8fd01460d8194dacdab8c03b9a380b3796 GIT binary patch literal 785 zcmZuv+iuf95IyT$oEk&gGzp~KT-rj?n_rN4DB=MmM5PE2t}5}kv6pr$-(;_g`dRRh zN+9t8d=z5Vj!0?x;2H1i%sDe>=l7o$GFJ&y%D~8%|bj(nHlLUgHJ(jU}Uqlm;9q~y>kf%qdj|Ta*?=XI%_W2U^PGgGZ4t-OYQ?%xYR+(vHfL4jxuPSG#gn=IVgi9|^hz9Qc E1rArZ@Bjb+ literal 0 HcmV?d00001 diff --git a/out/production/git_assignment_initial/src/SphereArea.class b/out/production/git_assignment_initial/src/SphereArea.class new file mode 100644 index 0000000000000000000000000000000000000000..f1bd33e73b7d39a96aad04f8798e8fcaaa8e07f6 GIT binary patch literal 1069 zcmZ`&+iuf95IvilQ`b#sdgD^cmJ~>O3x#q^N}(VsA|gNpRpN1zEbT^)9oY_5e}E6* zLy+JhMIiA3d=z5V4x}aUusgHknKNh3u7CXe`W?U~c1&cEPwZ5eK8#@rR}5S=kw89; zYuXm{Ry47Ul{8jOtYO_m1|=Q7ZeYW}4FfkBQd`PV!8Sv@P~2lkJa$`>AzM?9eBSFc zr1x4hY>MP+Zd2HM!c+P@2quC9Qt z#Sc|*z%AUtT?_Y6Hc+v!g$0J`Fu8NYqanHSd6^ryZ($n`ES$wTUGZC2-0PwI0bsea@KvO{;~YGGy~VU$~XNumWLofI9qgOuoYrPE?q`;z%N8OofC`cVsZSy1(r(Ob!RCI)U8RBB#5;^CcbsbJbObd3r4)?SAvZ zBE8=%NG*E*ak6x|v`^8gM3#|FE+2z^A}5Av+EZaLh8gm$C;_vWqZ8A&LAx$~MqqKW zW4Ty9-)=uy`bdWez$8nkFbGP6@F;NrLM1ql3j||O-aL6R@-Jdx0DMTlny#;WM*JHR zZ;p}7rTQ>dX!ViqW9-BSlY+}DUoif@537%fC}B8DCTu-UtSyu=5z?8B;Q!F6;1W^P KQY?leT>b?HHt3=N literal 0 HcmV?d00001 diff --git a/out/production/git_assignment_initial/src/SphereVolume.class b/out/production/git_assignment_initial/src/SphereVolume.class new file mode 100644 index 0000000000000000000000000000000000000000..f6be0fcb468b5e037469479da54d870a2c72f69e GIT binary patch literal 925 zcmaJ=+iuf95Iq|lZ{iwKQiqmOE-g1Fr7@QlC~2#zL`an)KnjY)qmwM{7RR<68>!EH z5j>;_BtC$TLd@Dh4NXNN&FozE%*>hfuixK)0$9h6fmy5=xQ#pdZiig-(|0$rLlJjz zkK?|90#*vJm98pLQ)1P?1FUh>IUJ6M4EmPzWxT_1!LD`~w3k6&FqB%-7q62+S48jJ zu1B77E9kji$Bm@2$4)IiltUF8Mm?t;9*RhG0xube2E(i$#PY*&JLwL4kt867irqSL zKe>+Q`Ug%sj--FkP(}0750hBoOogez$nDF7s<0**89am04w9%RUP;y4<;l`@g<+zM zIgUpr9^(nex`_=uWtcyUzn4g_uUg|7@V1F(c&@~zi5F;aY?;``B8_u)L~@;?z3Co_ z9!*eES^JYSPb4*iB&BjDbfcm8Yn@99jXH6$eLRfCfL0VJmMR%bGH~7!gE8?a+yN1; zyJ0B&KEv91G*3}G9-S^O+0E*I!i6}hfo3lu00~-;mq4=mCFJ ze+&6wQ~L`31BLe|D3*;8W)`#&%n>e*aOt#6nE(KeJbf1yim1a#OV(1qGcKvRyoMzz Ynnw-Saf4>C$a9lU8hLLKMh?q=05#Fh_W%F@ literal 0 HcmV?d00001 diff --git a/out/production/git_assignment_initial/src/SummationSeries.class b/out/production/git_assignment_initial/src/SummationSeries.class new file mode 100644 index 0000000000000000000000000000000000000000..2498874c66f0eac61cd0103eef00c65613fc0ea3 GIT binary patch literal 1155 zcmZ`&OK;Oa5dJn!V%IoLn=~!Z6wITLq>u1ufu;|j1w^Fqkb)|4!%3EQi(^N&Q`7@D z{s{*zT;Px*koW=o9!^L+W}T=hO;O~X-I>{MzWHYJ{r8t|02XjxM-tORxP;3payk@D zYsgDmkjspYS6({UmWyjjJinir!6{~?KoULU^ zG$x!@JCM8v!VG%VZF_b8KuG3eM~KbK3kF7!QgPG3Ei5ri90gf#3%eofFFxe9?arEI z(`uRrNTwh5Xj)FA8wrUE-Y{Q_V7p`*C}G*a3RYFD8MqCTLG!rZwu6$X;*Np4ST}GI zr)1`afqOC|eT<9@BYkd9YCF76O($hy`LIlflB#=tz@@~l)F;!`N4UkOq+LJ?a;r(R ziCe7}cNz?H#|bKafZn>5%Zh6=`5CS)XCF-%i;H_?8q|YgwMp z>G+>{)3eFaD;g-)XQhVdwu5u@(vu+7=ue`Mr7_c*rc;qDBO5F1gMFk;1Y@+uLuVWr z+8f;jjAJ5<(|pJyFTbJeDA|m%8eN;3e1}AK>c#3?g}wjtBm02@N(eTN80|Gm9-^O) z1g&X;mEZ*eh!VHcn51li>XnhZEcqDSN@I$45uBm8j>s=W8T&~cF`R|jqq0jV5sH^S zA@UW<^L<29u@2%h^mU+ipdAVfk+U%K8Tvj>bYO(>M8EmrkjW^unZgoPmpsS2=m+dd Pr0IF8&2WLD5nTKW_Bi`} literal 0 HcmV?d00001 diff --git a/out/production/git_assignment_initial/src/Topic.class b/out/production/git_assignment_initial/src/Topic.class new file mode 100644 index 0000000000000000000000000000000000000000..03ee8abe1ab853162d355fe98dc0e9e8b531cde0 GIT binary patch literal 1186 zcmZuw+fvg|6kR7x2_z|$a`l3ufTZP8FL*8D-5F*IK9s@Hw=|6|FoK)qM5uy&y6`R;o21siSHdnA$A9`{+dL({P?!!a|LjptbZtetuy(brBq8|equ9&!rYbGXe%EWctFj2s= ziJRaS20C_R;ug+uuhJd$;MybPi2kGUw(CgFakJIX4eYQUaE!52Hs{2-m=66dfI{}E zK(BXHIr`6N4-q+YZOd+~yDue{C2LeaGKLTH|02cgv|kUsXM6D~afbhRimyQM*XJns zP18~^2$grvjpr~ucah)?Nayw;a-X3**+=37)OS(#2+w|IfKNk(K^zmKw9Hlw#xPDx z;24g#@$R#SA~SODq0Sv3so-&pB_AS)Vvvo*8ExgZaU|{uoFtNv8)Hl|%ttnml!$NX zP#|gb&<)Cn=_K1QEup6wpX3-?GGDPuWxkdBh@Jyz0&DXJ=oNU4F<$xvzCvGLAYntn zo8R9hB7phbk`fUF}C7S3XdeW&R)p!|fcVdh7q>l|GQ GX8!=7z4X2S literal 0 HcmV?d00001 diff --git a/out/production/git_assignment_initial/src/fibonnachi_series.class b/out/production/git_assignment_initial/src/fibonnachi_series.class new file mode 100644 index 0000000000000000000000000000000000000000..9eedd6dec4cb0a995ea8b67bd78133ea129acf56 GIT binary patch literal 1116 zcmZ`&+iuf95Ix&moEW$1B}pNaVknoSw{U5JUMSE?h)AJS3aZ2tY@BVo#jzt_K>Z$G z`vMPX1ri^?MBwMVa&!j>D}Z`Q8_v6#fRmk+VsrT&vU=*e-o! zM;igRKECFi9?ZDo2J+yf5jK6xlT?$TP_7^IPrPb#=djucJn0;6D1IsFbizQ<845G# z4L9^G@lqWF~}Od7b1D;ib}Ji=q*|1Z{dDD9S_vHD8bw!3K7Ox`y8fM(pF z$(>dliW-ojWqy{yk!j!w)(os;L&K(lrUX3t(7Z7iIg!F5&pX(4X~r?Gfec`sX2i-RBC5B-17x(|1*EO zIx}>WhKluBX%V{Z;0C>m97r{KD+#hRbXuoqS0&5HrsmJUzS7SK^0cNSXBq|iH{t{o zF-^OSx-8^ThxZ~dpioMFL8^3GO1921Qc9`y!zm>sBCs*CKo%+J&@egxT0jX`DK-=3 zGL3MrVYY`J(y2E`b>*A|t*b(mC|ky=WIn|}ZVs`^v_ literal 0 HcmV?d00001 diff --git a/out/production/git_assignment_initial/src/twoPowerN.class b/out/production/git_assignment_initial/src/twoPowerN.class new file mode 100644 index 0000000000000000000000000000000000000000..ad4133f8568102888ef9232469b6237a6acf1428 GIT binary patch literal 669 zcmZuu%We}f6g^I6I?Z&NmZT|f=nF_viP<2rC_+L=NK{d&6qNmBa8p-_9eHM2_3?SwzkdJt3E&0xLoDG=h`YE~!+ksm@eq#!JPxoGU|V46 zmC`DIEl_QD1_It&^GOP<^^}%J#bhY$$7DF>q|q~JG9DyWx&CVC<)SWe0hFNMASp-_`-dS><#N$Md;(l(G9vwJEU+HO)JAr?WX-XFp0ddHk zl~fA*rm(4er<|qwU&ZI{YJ_Ff0_;TC#a@6X5uV~%fOdoqx&o^=JksJq?!)j*rnIo; zAn&i6t}j46qelX@X<{=u-~TretzKj9&$3)HLDjg3t$9Rc;$z0o`3N$Z@U@zy%FVGr zFm<4@=BKm|I|FRP=T~yhf30w3TGo(V%vEspyWb!_m&Yrt4h(pRSfe=rtEjVMRIIbQ z%cmtRu(AIgl{eu_?+dD%-qz*pE4&3)gFK+5Ptj%GYhtD3?UwV6D_*kT78+#ssnBFs QAv!{fJCD;%a#V2p4|C;+`Tzg` literal 0 HcmV?d00001 diff --git a/src/CircleVolum.java b/src/CircleVolum.java index 569fc51..45e23c6 100644 --- a/src/CircleVolum.java +++ b/src/CircleVolum.java @@ -1,3 +1,5 @@ +package src; + public class CircleVolum implements ISubscriber { @Override diff --git a/src/ISubscriber.java b/src/ISubscriber.java index f24e250..9c29e10 100644 --- a/src/ISubscriber.java +++ b/src/ISubscriber.java @@ -1,3 +1,4 @@ +package src; public interface ISubscriber { public abstract void notifySubscriber(String input); diff --git a/src/Main.java b/src/Main.java index d9c36d3..ba616fb 100644 --- a/src/Main.java +++ b/src/Main.java @@ -1,50 +1,28 @@ +package src; import java.util.Scanner; public class Main { - private static ISubscriber subscribers [] = { - new SimpleSubscriber(), - new ReallySimpleSubscriber(), - new MultiplicationSeries(), - new twoPowerN() - }; - public static void main(String[] args) { - Topic mathTopic = new Topic(); - for (ISubscriber sub : subscribers) { - mathTopic.addSubscriber(sub); - } - Scanner sc = new Scanner(System.in); - String input = sc.next(); - mathTopic.dispatchEvent(input); - } -} -======= -import java.util.Scanner; - -public class Main { - private static ISubscriber subscribers [] = { - new SimpleSubscriber(), - new ReallySimpleSubscriber(), - - new MultiplicationSeries(), - new SphereVolume() + private static ISubscriber subscribers[] = { + new MultiplicationSeries(), + new SphereVolume(), new MultiplicationSeries(), - new CircleArea() + //new CircleArea(), + new MultiplicationSeries(), + new CircleVolum(), + new SphereArea() + - new MultiplicationSeries(), - new CircleVolum() - new SphereArea() + }; + public static void main(String[] args) { + Topic mathTopic = new Topic(); + for (ISubscriber sub : subscribers) { + mathTopic.addSubscriber(sub); + } + Scanner sc = new Scanner(System.in); + String input = sc.next(); + mathTopic.dispatchEvent(input); - }; - public static void main(String[] args) { - Topic mathTopic = new Topic(); - for (ISubscriber sub : subscribers) { - mathTopic.addSubscriber(sub); - } - Scanner sc = new Scanner(System.in); - String input = sc.next(); - mathTopic.dispatchEvent(input); - - } + } } diff --git a/src/MultiplicationSeries.java b/src/MultiplicationSeries.java index ca25ffc..18600d4 100644 --- a/src/MultiplicationSeries.java +++ b/src/MultiplicationSeries.java @@ -1,4 +1,4 @@ - +package src; /* OverView : A class calculates a multiplication series from 0 to N Author : Lamya Raed Aly @@ -22,27 +22,3 @@ public void notifySubscriber(String input) { System.out.println("and my result is : " + MultSeries(Integer.parseInt(input))); } } -======= -/* - OverView : A class calculates a multiplication series from 0 to N - Author : Lamya Raed Aly - ID : 20170399 - Group : CS-4 - */ - -public class MultiplicationSeries implements ISubscriber { - - public int MultSeries(int N){ - int answer =1; - for(int i=1; i<=N; i++){ - answer *= i; - } - return answer; - } - - @Override - public void notifySubscriber(String input) { - System.out.print("Hello, I am a multiplication series and I am notified with " + input); - System.out.println(" and my result is : " + MultSeries(Integer.parseInt(input))); - } -} diff --git a/src/ReallySimpleSubscriber.java b/src/ReallySimpleSubscriber.java index e4d8845..9a5316d 100644 --- a/src/ReallySimpleSubscriber.java +++ b/src/ReallySimpleSubscriber.java @@ -1,3 +1,4 @@ +package src; public class ReallySimpleSubscriber implements ISubscriber { @Override diff --git a/src/SimpleSubscriber.java b/src/SimpleSubscriber.java index 7baae71..6372150 100644 --- a/src/SimpleSubscriber.java +++ b/src/SimpleSubscriber.java @@ -1,4 +1,4 @@ - +package src; public class SimpleSubscriber implements ISubscriber { @Override diff --git a/src/SphereArea.java b/src/SphereArea.java index 8a48267..0c0eb10 100644 --- a/src/SphereArea.java +++ b/src/SphereArea.java @@ -1,7 +1,5 @@ - +package src; public class SphereArea implements ISubscriber{ - - public float SArea(float R){ float result; result=4*(float)(22.0/7.0)*(R*R); diff --git a/src/SphereVolume.java b/src/SphereVolume.java index 619c7fb..b9d0957 100644 --- a/src/SphereVolume.java +++ b/src/SphereVolume.java @@ -1,5 +1,5 @@ - -public class SphereVolume implements ISubscriber{ +package src; +public class SphereVolume implements ISubscriber { @Override public void notifySubscriber(String input) { diff --git a/src/SummationSeries.java b/src/SummationSeries.java index 15d3922..98325c2 100644 --- a/src/SummationSeries.java +++ b/src/SummationSeries.java @@ -1,8 +1,9 @@ +package src; /* Name: Omar Khaled Ali ID: 20170374 */ -public class SummationSeries implements ISubscriber{ +public class SummationSeries implements ISubscriber { private int Sum (int num){ int sum = 0; for(int i=1 ; i<=num ; i++){ diff --git a/src/Topic.java b/src/Topic.java index 50e2b2f..21b5290 100644 --- a/src/Topic.java +++ b/src/Topic.java @@ -1,3 +1,5 @@ +package src; + import java.util.ArrayList; import java.util.List; diff --git a/src/fibonnachi_series.java b/src/fibonnachi_series.java index f3eed3d..3c50bf3 100644 --- a/src/fibonnachi_series.java +++ b/src/fibonnachi_series.java @@ -1,23 +1,21 @@ - - - +package src; /* fibonnachi series name: omar mahmoud salah id:20160163 */ +public class fibonnachi_series implements ISubscriber { + + static int fibb(int N) { + if (N <= 1) + return N; + else { + + return fibb(N - 1) + fibb(N - 2); + } + + } -public class fibonnachi_series implements ISubscriber{ - - static int fibb(int N) - { - if (N <= 1) - return N; - else{ - - return fibb(N - 1) + fibb(N- 2);}; - } - - public void notifySubscriber(String input) { + public void notifySubscriber(String input) { System.out.print("Hello, I am fibonnachi series and I am notified with " + input); diff --git a/src/twoPowerN.java b/src/twoPowerN.java index d73ad4a..4bd2c99 100644 --- a/src/twoPowerN.java +++ b/src/twoPowerN.java @@ -1,4 +1,7 @@ -public class twoPowerN implements ISubscriber{ +package src; + + +public class twoPowerN implements ISubscriber { @Override public void notifySubscriber(String input) { diff --git a/twoPowerN.java b/twoPowerN.java deleted file mode 100644 index d73ad4a..0000000 --- a/twoPowerN.java +++ /dev/null @@ -1,10 +0,0 @@ -public class twoPowerN implements ISubscriber{ - - @Override - public void notifySubscriber(String input) { - long num = Long.parseLong(input); - long res = 1; - System.out.println(res << num); - } - -} From 2286f2557ca861a2861c3cecbb4b349ec610ff4d Mon Sep 17 00:00:00 2001 From: youssef-Ehab Date: Mon, 2 Mar 2020 23:20:21 +0200 Subject: [PATCH 20/22] created CircleArea class and removed 2 calls of multiplication series in the main as it was called 3 times --- .idea/misc.xml | 2 +- .idea/workspace.xml | 36 +++++++++--------- .../git_assignment_initial/.idea/misc.xml | 2 +- .../.idea/workspace.xml | 12 ++++++ .../git_assignment_initial/src/Main.class | Bin 1238 -> 1274 bytes src/CircleArea.java | 10 +++++ src/Main.java | 4 +- 7 files changed, 42 insertions(+), 24 deletions(-) create mode 100644 src/CircleArea.java diff --git a/.idea/misc.xml b/.idea/misc.xml index 6a46f48..012255a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 82ae97e..dee43f1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,28 +2,13 @@ + - - - - - - - - - + + + - - - - - - - - - -