From 7003bd7bcff22e54737d92cbae786428e68b2e5c Mon Sep 17 00:00:00 2001 From: 245965 <245965@edu.p.lodz.pl> Date: Thu, 9 May 2024 17:53:01 +0200 Subject: [PATCH 01/25] =?UTF-8?q?=E2=80=9E1.=20dodanie=20pliku=20gitignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 28 ++++++++++++++++++ .../edu/kis/vh/nursery/FIFORhymer.class | Bin 0 -> 682 bytes .../edu/kis/vh/nursery/HanoiRhymer.class | Bin 0 -> 673 bytes .../vh/nursery/defaultCountingOutRhymer.class | Bin 0 -> 994 bytes .../factory/DefaultRhymersFactory.class | Bin 0 -> 902 bytes .../vh/nursery/factory/Rhymersfactory.class | Bin 0 -> 288 bytes .../kis/vh/nursery/list/IntLinkedList.class | Bin 0 -> 1079 bytes .../edu/kis/vh/nursery/list/Node.class | Bin 0 -> 379 bytes .../edu/kis/vh/nursery/RhymersDemo.class | Bin 0 -> 1895 bytes .../edu/kis/vh/nursery/RhymersJUnitTest.class | Bin 0 -> 1894 bytes 10 files changed, 28 insertions(+) create mode 100644 .gitignore create mode 100644 target/classes/edu/kis/vh/nursery/FIFORhymer.class create mode 100644 target/classes/edu/kis/vh/nursery/HanoiRhymer.class create mode 100644 target/classes/edu/kis/vh/nursery/defaultCountingOutRhymer.class create mode 100644 target/classes/edu/kis/vh/nursery/factory/DefaultRhymersFactory.class create mode 100644 target/classes/edu/kis/vh/nursery/factory/Rhymersfactory.class create mode 100644 target/classes/edu/kis/vh/nursery/list/IntLinkedList.class create mode 100644 target/classes/edu/kis/vh/nursery/list/Node.class create mode 100644 target/test-classes/edu/kis/vh/nursery/RhymersDemo.class create mode 100644 target/test-classes/edu/kis/vh/nursery/RhymersJUnitTest.class diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..b4bd3ee3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,28 @@ +## Compiled class file +#*.class +# +## Log file +#*.log +# +## BlueJ files +#*.ctxt +# +## Mobile Tools for Java (J2ME) +#.mtj.tmp/ +# +## Package Files # +#*.jar +#*.war +#*.nar +#*.ear +#*.zip +#*.tar.gz +#*.rar +# +## virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +#hs_err_pid* +#replay_pid* + + +/.idea/ +/.target/ diff --git a/target/classes/edu/kis/vh/nursery/FIFORhymer.class b/target/classes/edu/kis/vh/nursery/FIFORhymer.class new file mode 100644 index 0000000000000000000000000000000000000000..bf23cba05f2e8cd64dabc652b3083e537bdf65e7 GIT binary patch literal 682 zcmZ`$%Syvg5IvJdV{2-ykNT`{Q7hVw;zDs#C-iPH8s=kA5YeFO=s+i7S(N;2#cpIT%UQ>F z8^XQHmc*&)SG`=_cRbrU+w;Bs@>NZ^gw8G7vAu0VWO1n&MHiwPVmi8^6Vh!a<&FH_ zZ?Ec!+67^y(1!P);%1CBdUPbvONd%#wVEpns}krR%T4-p^kaa~Wl6K_G$XBnp4CLx1K}ZyAN9_8w6X713CsjuJ3UwAMnyxML5LCUg-5^Z1 zTi|ceO?Kc4_CW?Ae&Cr_Wyib-N5l^5zH5oREkzQ4O{?eTrHN^FrSLCtuY6LD6pr|t z_#ESG8xf9x-pmsy^8)3F??-6&0dt&Bxg40Ka#xxoy~W1_COISdR^hB`W=ifxriu6s zl9>l+JT}?H;O+N^%$i7UweAsF51}STZ@=Hi?gAMpIm-5cC^WV_h&an8uz)1iSxj0; cwPZpIY35JyqJ){COU1w^G#X-HmH`EGKeBg=hyVZp literal 0 HcmV?d00001 diff --git a/target/classes/edu/kis/vh/nursery/HanoiRhymer.class b/target/classes/edu/kis/vh/nursery/HanoiRhymer.class new file mode 100644 index 0000000000000000000000000000000000000000..f2165ddf707e9af15aa9dda68b7951da4cd13f72 GIT binary patch literal 673 zcmaJ;%Wl&^6g^`*bz+<*4W$%P=xfs&iELOPf!IVsL<%6aC=#rgI0Ko+wIgR-slUP+ zi47Yhpb`r{fR93)aSUaFSj^0Qo^$Sz~Ba6iJvm!M*efzvHN7M6Dl?$vq)TuU)1l)teQ3G`}d;}q`AQZU$52PnD z&Ghf)rpb&S5ubiGQ39=@PSvyGbgc3ha-1;I8D^vy$y{5%3VLR$7XmxO z|BHVhu$rrRmYYlYjwWgI*vNSHRL(2B;5aMtSUuL3vHjQhcTeP*#4d+&_z!}IOXKa* z=11_pLGM1ZHWx$}5Rv-@{wI14ZrWJc>B3`umwvdc#1?MR1 z080W2xNNTdY344g=7f^0#J%V%n(wgL<-7JC?dT=Jyw{ZU0rjYRfooQpTT1ItloixM hlZY*j*)CZ&mPi!~F|l3B-eI)|XUik!E^P;UzW@$SdYS+L literal 0 HcmV?d00001 diff --git a/target/classes/edu/kis/vh/nursery/defaultCountingOutRhymer.class b/target/classes/edu/kis/vh/nursery/defaultCountingOutRhymer.class new file mode 100644 index 0000000000000000000000000000000000000000..91acad320cc9bf41db4fa8f079f34b4f82a4b1bd GIT binary patch literal 994 zcmb7?U2D@&9LArMq)nTqFSc{*I=A`GR&l-YP7$#>D0D6CrCtXh4CgLo*RWTp)K~9a|OG z^7bpu&Vk(x1me#e&k3FjsB7!3BoavKFifOi3OurVVP)WqD#!hb7Y;}E@TAhSKUkp~ zRQ=Ek9B;oF2HX9ULwhKoH}`W$obj4C7P)%GbHR7M{2ij4Gk+TA(96m> z(qFl&V3A`6Dn}I>>rCh{xI@SiGcs&$Vy-?bse!VL(E<#rb*No|J{h#h%6Qu$IXw3DW~H=h~Jp{ zoFu%!Ac{z`<*DDo3|)mtl6vogy~h@0gQd%C8FpLiG3+Z6%amB5#OjPh>8iwiLKQst E3m~4A~P!@_+x%4D!46VANmO+H{xD+p@^=%dgDemHKBi3MN01x zdRMC#4vK_z8D!qAO1=A*7iCE*lLs%5S0W4bew;;GMc4IApSB+EWa7dx{)2=C3*{gC z^^VRpx*@`%MRz2kSapPDBdicMEy63&)G?QHke8Dqsh?*Zj1j7TP;GhJgizRz14$UJ zsYsq=cMX}Gi$=(q(OTRT;e|+)xwn%A-BKxGtMT)#cJBlXt~v literal 0 HcmV?d00001 diff --git a/target/classes/edu/kis/vh/nursery/factory/Rhymersfactory.class b/target/classes/edu/kis/vh/nursery/factory/Rhymersfactory.class new file mode 100644 index 0000000000000000000000000000000000000000..c09a513e814d0f1d083710e1ce4b5597e19c39c2 GIT binary patch literal 288 zcmZus%ZkE45UlnUbzNEUC-mZ6ym?%R3JZbt3)-aBxY-FzW(0rDgCF2Wi4&6CymWOH z)kXE=dAkExVicf7m`mc+Us|ZkNoi*aF;{iq*ybL8PuG7jMNI>A2w!Kuu*z5;RkS}# zYzdRK*qvpaut};5f||{L-UKIdV3*nN+-aNYW8`dgup*3oO2}CuO~hv@Y{RJGrD4N5 wPa9#l%bkfOOfw-&E4AsmC~Nizgtq?`==kbg^!!2yYV6lIDA7BIezx%O0#dY39smFU literal 0 HcmV?d00001 diff --git a/target/classes/edu/kis/vh/nursery/list/IntLinkedList.class b/target/classes/edu/kis/vh/nursery/list/IntLinkedList.class new file mode 100644 index 0000000000000000000000000000000000000000..7200af62a9196a44ca01001acb356af81ae01946 GIT binary patch literal 1079 zcmaJD0PbeJMukIiDk$s2G?{ z5`N$e@>KlLz#QfUbT@o^;zy^+EFWd*f`J+q1u_HMiyZ;6%g-g&8wwJb;tL>5Op@I2>ejK!%9XFA33w2#?4ojR?;b!H>4eFMOEEhd=x0ceC==~c1n4!BV@pG0bSpN%Z>!@7- literal 0 HcmV?d00001 diff --git a/target/classes/edu/kis/vh/nursery/list/Node.class b/target/classes/edu/kis/vh/nursery/list/Node.class new file mode 100644 index 0000000000000000000000000000000000000000..8b2b6c6601a92466a274935aeeef525d70523fd0 GIT binary patch literal 379 zcmaJ+O-sW-6r7i&jft_X^%E4qTiZkT;!W`)6bhjpl-xJzVz9*rXp zTku@?0k#nkPSvs&kGd4iN@R6Ws^V3ox~#+^Un)YUk!j6HbAt0+sD^MB{wKL)UZ!4n zsxz98BZiySs2}P~E$XLO756eu*>V`>iA*C|Xj5;RPPNh{kJAMIF0YG3&9otVW}T^t zhI0;JadaDGBJhi_gIRh?#&O6 zzJ37UGAsox2+5FCv?9z9+t%;unyFix+QRxaFS!iiDZ?_{X@*cLU6c`F7~|!-wqw+^ zyIY!7cWT_()i(5!YtuZ-H}tycE^X~rxKqpdy9#6xq@5uX04@8F8M|(|hPAm+Z=%}~ zMTd+|6)|)%qywNwQJdkKONOo+++B8ctE@X^|BOLPr3(QRr$x_-@ZBnUMC=aY%jsr~ z`()y%SH&4|6ctDL+`{omzlx`hKsR;EHvA(63eKq*z#xNM5+9ql7^GBQsG2;IzU~^P zwnUlR6$L{GiQ$5ZXK;~F7XN@iR1<;93&Q7Aq>yH4E9s^=v&Bn0UY+i=A%kHVBPvFr z9dUbQUEZy^yh2`forn?zui%EQEjorpnmJsrWMzyqoH=d<+NQ!>uN!8WI|{}`S_&?! zcpg_6BHqVP*}Tw{))-z?aTPC7@95Pkx5^CXC}BU8pTtSRYy?vbEy<)nP7CBUhLO}0 z?%C5B1oBlC*D*usxVE1!Ll2ew|6h?+@EUS5Zm774JVSSY01T~FAqVLbltxidysn}k zZj9`CnpOn!3~|?Xbu;O3admh(Y1EQ378wQu8t*@?v4ABN%RVe$ETWt}^>^>veW;su*}q^LWFST{E%cgv_TB!e!- z3EC|2R&;~fwKui;q@w8}1KXy5l9L(at2>*-+8y9Zdi{GzGeJ>O{UXvRJrbpzIlb!XA!Cz4S+?s=iRTO|DAJ_Jw!6LZdhaBDh1N>N{W+@6f6Z?_!O12+V$jL{z}<2as3pqpcu+ z3uPsg`3fq-@`^-8To|onB!m$rqmPU^X?h^mxsPP%ijzGV3W$bhL0(_LD+5b rNJDvqNf}WYJM1C-3?8EU5UqbhkugMzzK3XG;mjd@7K2HE7F7NL>e1b^ literal 0 HcmV?d00001 diff --git a/target/test-classes/edu/kis/vh/nursery/RhymersJUnitTest.class b/target/test-classes/edu/kis/vh/nursery/RhymersJUnitTest.class new file mode 100644 index 0000000000000000000000000000000000000000..5f030e6ed34828f397524a79f06da85d67086a0a GIT binary patch literal 1894 zcmb`HUsDrT7{;HI-DE?u;a`aY21PM7B*F?>+8PrL5!zrZjKs{qjkAOm7DCo0Sw`<` zKS*zS-HRgA&h!KH1N5>Vq!-%f?B|leRbZsAcG+?2mPsn@*sQzO`g4H`sqNYFM-f?xH6xj> z3*1P(7vLL~{dmS_`c%ga$rQ3%t8Tp>eAoF%2QoTtdJcHz&^!(E0yF3M?7P}pdrBWF zR*NR6MQ7I%7%JNh>l^oI$7)v0ojPYm%MRsN&898Kok_L5Z_}z|`9I{&3Pjti;T@_x zu~5@HQ-Qhjw*ONLFwKBWQ}cXwb(5J6HjEn99dPnWfQW{XgF=NZ95Gz4ww5U zE~PS0%){xQsn`~X$hnf|DU;g*gPWB?@zJwlVWUtiRkpZmvu)N6ADb^a9_Vt%Mz7aK zRvvFuwx0RBs)h2?6?T?aNOmd@gEclCw^_4RZRu>13azcuqY36*U4!h;gL@JHF~6}4rvTCm8nZMZO8`g75erj0%foLa4E~yeK zE`j^7-znn9cYn&|yj+;_7bUXd9afqaf&Up{o^lk|Q`23v8W5Tx2^=l69JVNpjAS zagjK8*&0&o9lv}}*X>?YEl{o0HAIj6rkbRGveDEtavuJRoOJ#?Iq7^?0p;{V&dRw@ lIS(jjnIJ{VS)rU&%K4gdN|duk^hX3L|8H_uXiEUAe*<>{V1EDr literal 0 HcmV?d00001 From f20ee97927431b6b8f65749c1a305188b9f95161 Mon Sep 17 00:00:00 2001 From: 245965 <245965@edu.p.lodz.pl> Date: Sun, 12 May 2024 16:13:56 +0200 Subject: [PATCH 02/25] 2.Formatowanie kodu --- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index 755b2d58..2ba02b31 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -1,17 +1,18 @@ package edu.kis.vh.nursery; public class HanoiRhymer extends defaultCountingOutRhymer { - -int totalRejected = 0; + private int totalRejected = 0; public int reportRejected() { return totalRejected; } + @Override public void countIn(int in) { - if (!callCheck() && in > peekaboo()) + if (!callCheck() && in > peekaboo()) { totalRejected++; - else - super.countIn(in); + } else { + super.countIn(in); + } } } From abc93e7b51a4765dafa2bd7f691e418efbf29f5f Mon Sep 17 00:00:00 2001 From: 245965 <245965@edu.p.lodz.pl> Date: Sun, 12 May 2024 16:19:30 +0200 Subject: [PATCH 03/25] 2.Formatowanie kodu dalej --- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index 2ba02b31..773c985e 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -1,7 +1,7 @@ package edu.kis.vh.nursery; public class HanoiRhymer extends defaultCountingOutRhymer { - private int totalRejected = 0; + int totalRejected = 0; public int reportRejected() { return totalRejected; @@ -9,10 +9,11 @@ public int reportRejected() { @Override public void countIn(int in) { - if (!callCheck() && in > peekaboo()) { + if (!callCheck() && in > peekaboo()) + totalRejected++; - } else { + else super.countIn(in); - } + } } From 34c9bbbe7f88fe18b064a03aa28ca75542081dbc Mon Sep 17 00:00:00 2001 From: 245965 <245965@edu.p.lodz.pl> Date: Sun, 12 May 2024 16:22:00 +0200 Subject: [PATCH 04/25] 2.Formatowanie kodu --- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index 773c985e..697214ab 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -12,7 +12,7 @@ public void countIn(int in) { if (!callCheck() && in > peekaboo()) totalRejected++; - else + else super.countIn(in); } From b61844c321a908531a77331c0784c094f7c5c7e0 Mon Sep 17 00:00:00 2001 From: 245965 <245965@edu.p.lodz.pl> Date: Sun, 12 May 2024 16:25:00 +0200 Subject: [PATCH 05/25] 2. Formatowanie --- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index 697214ab..cf7eddd8 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -1,6 +1,7 @@ package edu.kis.vh.nursery; public class HanoiRhymer extends defaultCountingOutRhymer { + int totalRejected = 0; public int reportRejected() { From a2d30c0af35b0af6c382213dc7752af1efc6404a Mon Sep 17 00:00:00 2001 From: 245965 <245965@edu.p.lodz.pl> Date: Sun, 12 May 2024 16:28:29 +0200 Subject: [PATCH 06/25] 2.Formatowanie --- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index cf7eddd8..4e65e348 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -1,8 +1,6 @@ package edu.kis.vh.nursery; -public class HanoiRhymer extends defaultCountingOutRhymer { - - int totalRejected = 0; +public class HanoiRhymer extends defaultCountingOutRhymer { int totalRejected = 0; public int reportRejected() { return totalRejected; From 086165dc85c5b9454ecd52e7f6ea626d047b3dd2 Mon Sep 17 00:00:00 2001 From: 245965 <245965@edu.p.lodz.pl> Date: Sun, 12 May 2024 16:32:20 +0200 Subject: [PATCH 07/25] 2.Formatowanie --- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index 4e65e348..7b285c81 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -1,6 +1,8 @@ package edu.kis.vh.nursery; -public class HanoiRhymer extends defaultCountingOutRhymer { int totalRejected = 0; +public class HanoiRhymer extends defaultCountingOutRhymer { + + int totalRejected = 0; public int reportRejected() { return totalRejected; From b3f75e9f0a422ff7535e82af1879f2b108e03775 Mon Sep 17 00:00:00 2001 From: 245965 <245965@edu.p.lodz.pl> Date: Sun, 12 May 2024 16:33:58 +0200 Subject: [PATCH 08/25] 2.Formatowanie --- git | 0 src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 4 +--- 2 files changed, 1 insertion(+), 3 deletions(-) create mode 100644 git diff --git a/git b/git new file mode 100644 index 00000000..e69de29b diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index 7b285c81..7c3942c3 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -8,13 +8,11 @@ public int reportRejected() { return totalRejected; } - @Override + public void countIn(int in) { if (!callCheck() && in > peekaboo()) - totalRejected++; else super.countIn(in); - } } From fc5444d106781d1494da2648e8c22f1ce4fbb7b6 Mon Sep 17 00:00:00 2001 From: 245965 <245965@edu.p.lodz.pl> Date: Sun, 12 May 2024 16:35:19 +0200 Subject: [PATCH 09/25] 2.Formatowanie --- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index 7c3942c3..6477c963 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -7,8 +7,7 @@ public class HanoiRhymer extends defaultCountingOutRhymer { public int reportRejected() { return totalRejected; } - - + public void countIn(int in) { if (!callCheck() && in > peekaboo()) totalRejected++; From 109be1ab320a9cb365c65aca2bb82d167583f934 Mon Sep 17 00:00:00 2001 From: 245965 <245965@edu.p.lodz.pl> Date: Sun, 12 May 2024 16:36:47 +0200 Subject: [PATCH 10/25] 2.Formatowanie --- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index 6477c963..51979137 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -7,7 +7,6 @@ public class HanoiRhymer extends defaultCountingOutRhymer { public int reportRejected() { return totalRejected; } - public void countIn(int in) { if (!callCheck() && in > peekaboo()) totalRejected++; From 2164aa36fa533c9c4c5cbe2ec4350e7659d11316 Mon Sep 17 00:00:00 2001 From: 245965 <245965@edu.p.lodz.pl> Date: Sun, 12 May 2024 16:37:57 +0200 Subject: [PATCH 11/25] 2.Formatowanie --- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index 51979137..6477c963 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -7,6 +7,7 @@ public class HanoiRhymer extends defaultCountingOutRhymer { public int reportRejected() { return totalRejected; } + public void countIn(int in) { if (!callCheck() && in > peekaboo()) totalRejected++; From 1feb03f7b323f585a60e1fc34dc476949041984c Mon Sep 17 00:00:00 2001 From: 245965 <245965@edu.p.lodz.pl> Date: Sun, 12 May 2024 16:39:34 +0200 Subject: [PATCH 12/25] 2.Formatowanie --- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index 6477c963..09085cf7 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -5,9 +5,9 @@ public class HanoiRhymer extends defaultCountingOutRhymer { int totalRejected = 0; public int reportRejected() { - return totalRejected; + return this.totalRejected; } - + public void countIn(int in) { if (!callCheck() && in > peekaboo()) totalRejected++; From d4c5654914b4f241f5f94860d946f077e41869e2 Mon Sep 17 00:00:00 2001 From: 245965 <245965@edu.p.lodz.pl> Date: Sun, 12 May 2024 16:40:34 +0200 Subject: [PATCH 13/25] 2.Formatowanie --- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index 09085cf7..ec0691fc 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -5,7 +5,7 @@ public class HanoiRhymer extends defaultCountingOutRhymer { int totalRejected = 0; public int reportRejected() { - return this.totalRejected; + return totalRejected; } public void countIn(int in) { From 2bdb3fe4c32940f1c0928cf51d126097dd870980 Mon Sep 17 00:00:00 2001 From: 245965 <245965@edu.p.lodz.pl> Date: Sun, 12 May 2024 16:45:22 +0200 Subject: [PATCH 14/25] =?UTF-8?q?3.Scalanie=20zmian=20z=20ga=C5=82=C4=99zi?= =?UTF-8?q?=20format?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/edu/kis/vh/nursery/FIFORhymer.java | 14 +++---- .../vh/nursery/defaultCountingOutRhymer.java | 38 +++++++++---------- .../vh/nursery/factory/Rhymersfactory.java | 22 +++++------ .../java/edu/kis/vh/nursery/list/Node.java | 2 +- 4 files changed, 37 insertions(+), 39 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java index 28591ada..13f788eb 100644 --- a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java @@ -3,19 +3,17 @@ public class FIFORhymer extends defaultCountingOutRhymer { public defaultCountingOutRhymer temp = new defaultCountingOutRhymer(); - + @Override public int countOut() { while (!callCheck()) - - temp.countIn(super.countOut()); - + temp.countIn(super.countOut()); + int ret = temp.countOut(); - + while (!temp.callCheck()) - - countIn(temp.countOut()); - + countIn(temp.countOut()); + return ret; } } diff --git a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java index 199abf6d..89033a01 100644 --- a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java @@ -11,24 +11,24 @@ public void countIn(int in) { NUMBERS[++total] = in; } - public boolean callCheck() { - return total == -1; - } - - public boolean isFull() { - return total == 11; - } - - protected int peekaboo() { - if (callCheck()) - return -1; - return NUMBERS[total]; - } - - public int countOut() { - if (callCheck()) - return -1; - return NUMBERS[total--]; - } + public boolean callCheck() { + return total == -1; + } + + public boolean isFull() { + return total == 11; + } + + protected int peekaboo() { + if (callCheck()) + return -1; + return NUMBERS[total]; + } + + public int countOut() { + if (callCheck()) + return -1; + return NUMBERS[total--]; + } } diff --git a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java b/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java index 033755d0..b480c321 100644 --- a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java +++ b/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java @@ -2,14 +2,14 @@ import edu.kis.vh.nursery.defaultCountingOutRhymer; - public interface Rhymersfactory { - - public defaultCountingOutRhymer GetStandardRhymer(); - - public defaultCountingOutRhymer GetFalseRhymer(); - - public defaultCountingOutRhymer GetFIFORhymer(); - - public defaultCountingOutRhymer GetHanoiRhymer(); - - } +public interface Rhymersfactory { + + public defaultCountingOutRhymer GetStandardRhymer(); + + public defaultCountingOutRhymer GetFalseRhymer(); + + public defaultCountingOutRhymer GetFIFORhymer(); + + public defaultCountingOutRhymer GetHanoiRhymer(); + +} diff --git a/src/main/java/edu/kis/vh/nursery/list/Node.java b/src/main/java/edu/kis/vh/nursery/list/Node.java index 0a2cd75e..1704f3ce 100644 --- a/src/main/java/edu/kis/vh/nursery/list/Node.java +++ b/src/main/java/edu/kis/vh/nursery/list/Node.java @@ -8,5 +8,5 @@ public class Node { public Node(int i) { value = i; } - + } From 3fe5ebfc7a78181e7dc8dd06d638be6ce9ea625a Mon Sep 17 00:00:00 2001 From: 245965 <245965@edu.p.lodz.pl> Date: Sun, 12 May 2024 16:49:10 +0200 Subject: [PATCH 15/25] 3. Formatowanie kodu --- src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java index 89033a01..7f743f0a 100644 --- a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java @@ -2,9 +2,8 @@ public class defaultCountingOutRhymer { - private int[] NUMBERS = new int[12]; - public int total = -1; + private int[] NUMBERS = new int[12]; public void countIn(int in) { if (!isFull()) From 64c6291fbc8c523fbc65b8ef4375cdc24ff5d304 Mon Sep 17 00:00:00 2001 From: 245965 <245965@edu.p.lodz.pl> Date: Sun, 12 May 2024 17:21:28 +0200 Subject: [PATCH 16/25] =?UTF-8?q?5.Poprawa=20nazewnictwa=20p=C3=B3l=20klas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/edu/kis/vh/nursery/defaultCountingOutRhymer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java index 7f743f0a..3dddfac1 100644 --- a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java @@ -3,11 +3,11 @@ public class defaultCountingOutRhymer { public int total = -1; - private int[] NUMBERS = new int[12]; + private int[] numbers = new int[12]; public void countIn(int in) { if (!isFull()) - NUMBERS[++total] = in; + numbers[++total] = in; } public boolean callCheck() { @@ -21,13 +21,13 @@ public boolean isFull() { protected int peekaboo() { if (callCheck()) return -1; - return NUMBERS[total]; + return numbers[total]; } public int countOut() { if (callCheck()) return -1; - return NUMBERS[total--]; + return numbers[total--]; } } From 92bdaba1bf3e402d87e52386ea0ee2a7a7f07fe4 Mon Sep 17 00:00:00 2001 From: 245965 <245965@edu.p.lodz.pl> Date: Sun, 12 May 2024 16:55:04 +0200 Subject: [PATCH 17/25] 4.1 poprawa nazw klas --- ...mer.java => DefaultCountingOutRhymer.java} | 2 +- .../{FIFORhymer.java => FifoRhymer.java} | 4 ++-- .../java/edu/kis/vh/nursery/HanoiRhymer.java | 2 +- .../factory/DefaultRhymersFactory.java | 19 +++++++++---------- .../vh/nursery/factory/Rhymersfactory.java | 10 +++++----- .../java/edu/kis/vh/nursery/RhymersDemo.java | 4 +--- ...rsJUnitTest.java => RhymersJunitTest.java} | 12 ++++++------ 7 files changed, 25 insertions(+), 28 deletions(-) rename src/main/java/edu/kis/vh/nursery/{defaultCountingOutRhymer.java => DefaultCountingOutRhymer.java} (93%) rename src/main/java/edu/kis/vh/nursery/{FIFORhymer.java => FifoRhymer.java} (70%) rename src/test/java/edu/kis/vh/nursery/{RhymersJUnitTest.java => RhymersJunitTest.java} (83%) diff --git a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java similarity index 93% rename from src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java rename to src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index 3dddfac1..582cc1c2 100644 --- a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -1,6 +1,6 @@ package edu.kis.vh.nursery; -public class defaultCountingOutRhymer { +public class DefaultCountingOutRhymer { public int total = -1; private int[] numbers = new int[12]; diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FifoRhymer.java similarity index 70% rename from src/main/java/edu/kis/vh/nursery/FIFORhymer.java rename to src/main/java/edu/kis/vh/nursery/FifoRhymer.java index 13f788eb..f50c5e3a 100644 --- a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FifoRhymer.java @@ -1,8 +1,8 @@ package edu.kis.vh.nursery; -public class FIFORhymer extends defaultCountingOutRhymer { +public class FifoRhymer extends DefaultCountingOutRhymer { - public defaultCountingOutRhymer temp = new defaultCountingOutRhymer(); + public DefaultCountingOutRhymer temp = new DefaultCountingOutRhymer(); @Override public int countOut() { diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index ec0691fc..89ffa912 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -1,6 +1,6 @@ package edu.kis.vh.nursery; -public class HanoiRhymer extends defaultCountingOutRhymer { +public class HanoiRhymer extends DefaultCountingOutRhymer { int totalRejected = 0; diff --git a/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java b/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java index 60ba2a16..cb42e845 100644 --- a/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java +++ b/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java @@ -1,29 +1,28 @@ package edu.kis.vh.nursery.factory; -import edu.kis.vh.nursery.defaultCountingOutRhymer; -import edu.kis.vh.nursery.FIFORhymer; +import edu.kis.vh.nursery.DefaultCountingOutRhymer; +import edu.kis.vh.nursery.FifoRhymer; import edu.kis.vh.nursery.HanoiRhymer; -import edu.kis.vh.nursery.factory.Rhymersfactory; public class DefaultRhymersFactory implements Rhymersfactory { @Override - public defaultCountingOutRhymer GetStandardRhymer() { - return new defaultCountingOutRhymer(); + public DefaultCountingOutRhymer GetStandardRhymer() { + return new DefaultCountingOutRhymer(); } @Override - public defaultCountingOutRhymer GetFalseRhymer() { - return new defaultCountingOutRhymer(); + public DefaultCountingOutRhymer GetFalseRhymer() { + return new DefaultCountingOutRhymer(); } @Override - public defaultCountingOutRhymer GetFIFORhymer() { - return new FIFORhymer(); + public DefaultCountingOutRhymer GetFIFORhymer() { + return new FifoRhymer(); } @Override - public defaultCountingOutRhymer GetHanoiRhymer() { + public DefaultCountingOutRhymer GetHanoiRhymer() { return new HanoiRhymer(); } diff --git a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java b/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java index b480c321..ded94a97 100644 --- a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java +++ b/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java @@ -1,15 +1,15 @@ package edu.kis.vh.nursery.factory; -import edu.kis.vh.nursery.defaultCountingOutRhymer; +import edu.kis.vh.nursery.DefaultCountingOutRhymer; public interface Rhymersfactory { - public defaultCountingOutRhymer GetStandardRhymer(); + public DefaultCountingOutRhymer GetStandardRhymer(); - public defaultCountingOutRhymer GetFalseRhymer(); + public DefaultCountingOutRhymer GetFalseRhymer(); - public defaultCountingOutRhymer GetFIFORhymer(); + public DefaultCountingOutRhymer GetFIFORhymer(); - public defaultCountingOutRhymer GetHanoiRhymer(); + public DefaultCountingOutRhymer GetHanoiRhymer(); } diff --git a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java index 05aba9fa..a1f89c7f 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java @@ -1,7 +1,5 @@ package edu.kis.vh.nursery; -import edu.kis.vh.nursery.defaultCountingOutRhymer; -import edu.kis.vh.nursery.HanoiRhymer; import edu.kis.vh.nursery.factory.DefaultRhymersFactory; import edu.kis.vh.nursery.factory.Rhymersfactory; @@ -10,7 +8,7 @@ class RhymersDemo { public static void main(String[] args) { Rhymersfactory factory = new DefaultRhymersFactory(); - defaultCountingOutRhymer[] rhymers = { factory.GetStandardRhymer(), factory.GetFalseRhymer(), + DefaultCountingOutRhymer[] rhymers = { factory.GetStandardRhymer(), factory.GetFalseRhymer(), factory.GetFIFORhymer(), factory.GetHanoiRhymer()}; for (int i = 1; i < 15; i++) diff --git a/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java b/src/test/java/edu/kis/vh/nursery/RhymersJunitTest.java similarity index 83% rename from src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java rename to src/test/java/edu/kis/vh/nursery/RhymersJunitTest.java index 144906eb..f8a4fe47 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersJunitTest.java @@ -3,11 +3,11 @@ import org.junit.Assert; import org.junit.Test; -public class RhymersJUnitTest { +public class RhymersJunitTest { @Test public void testCountIn() { - defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer(); + DefaultCountingOutRhymer rhymer = new DefaultCountingOutRhymer(); int testValue = 4; rhymer.countIn(testValue); @@ -17,7 +17,7 @@ public void testCountIn() { @Test public void testCallCheck() { - defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer(); + DefaultCountingOutRhymer rhymer = new DefaultCountingOutRhymer(); boolean result = rhymer.callCheck(); Assert.assertEquals(true, result); @@ -29,7 +29,7 @@ public void testCallCheck() { @Test public void testIsFull() { - defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer(); + DefaultCountingOutRhymer rhymer = new DefaultCountingOutRhymer(); final int STACK_CAPACITY = 12; for (int i = 0; i < STACK_CAPACITY; i++) { boolean result = rhymer.isFull(); @@ -43,7 +43,7 @@ public void testIsFull() { @Test public void testPeekaboo() { - defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer(); + DefaultCountingOutRhymer rhymer = new DefaultCountingOutRhymer(); final int EMPTY_STACK_VALUE = -1; int result = rhymer.peekaboo(); @@ -60,7 +60,7 @@ public void testPeekaboo() { @Test public void testCountOut() { - defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer(); + DefaultCountingOutRhymer rhymer = new DefaultCountingOutRhymer(); final int EMPTY_STACK_VALUE = -1; int result = rhymer.countOut(); From 5210d1dac2c658193df4b2c1854cb29bb962650f Mon Sep 17 00:00:00 2001 From: 245965 <245965@edu.p.lodz.pl> Date: Sun, 12 May 2024 17:06:50 +0200 Subject: [PATCH 18/25] 4.2 zmiana konwencji nazewniczej metod --- .../edu/kis/vh/nursery/factory/DefaultRhymersFactory.java | 8 ++++---- .../java/edu/kis/vh/nursery/factory/Rhymersfactory.java | 8 ++++---- src/test/java/edu/kis/vh/nursery/RhymersDemo.java | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java b/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java index cb42e845..05f11199 100644 --- a/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java +++ b/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java @@ -7,22 +7,22 @@ public class DefaultRhymersFactory implements Rhymersfactory { @Override - public DefaultCountingOutRhymer GetStandardRhymer() { + public DefaultCountingOutRhymer getStandardRhymer() { return new DefaultCountingOutRhymer(); } @Override - public DefaultCountingOutRhymer GetFalseRhymer() { + public DefaultCountingOutRhymer getFalseRhymer() { return new DefaultCountingOutRhymer(); } @Override - public DefaultCountingOutRhymer GetFIFORhymer() { + public DefaultCountingOutRhymer getFIFORhymer() { return new FifoRhymer(); } @Override - public DefaultCountingOutRhymer GetHanoiRhymer() { + public DefaultCountingOutRhymer getHanoiRhymer() { return new HanoiRhymer(); } diff --git a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java b/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java index ded94a97..da726cf0 100644 --- a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java +++ b/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java @@ -4,12 +4,12 @@ public interface Rhymersfactory { - public DefaultCountingOutRhymer GetStandardRhymer(); + public DefaultCountingOutRhymer getStandardRhymer(); - public DefaultCountingOutRhymer GetFalseRhymer(); + public DefaultCountingOutRhymer getFalseRhymer(); - public DefaultCountingOutRhymer GetFIFORhymer(); + public DefaultCountingOutRhymer getFIFORhymer(); - public DefaultCountingOutRhymer GetHanoiRhymer(); + public DefaultCountingOutRhymer getHanoiRhymer(); } diff --git a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java index a1f89c7f..b854e2ee 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java @@ -8,8 +8,8 @@ class RhymersDemo { public static void main(String[] args) { Rhymersfactory factory = new DefaultRhymersFactory(); - DefaultCountingOutRhymer[] rhymers = { factory.GetStandardRhymer(), factory.GetFalseRhymer(), - factory.GetFIFORhymer(), factory.GetHanoiRhymer()}; + DefaultCountingOutRhymer[] rhymers = { factory.getStandardRhymer(), factory.getFalseRhymer(), + factory.getFIFORhymer(), factory.getHanoiRhymer()}; for (int i = 1; i < 15; i++) for (int j = 0; j < 3; j++) From 08591e0778692ae9f97e563519de5c84d57a565c Mon Sep 17 00:00:00 2001 From: Michal Strozak <245931@edu.p.lodz.pl> Date: Sun, 19 May 2024 22:00:07 +0200 Subject: [PATCH 19/25] =?UTF-8?q?6.=20Deklaracja=20sta=C5=82ych?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kis/vh/nursery/DefaultCountingOutRhymer.java | 16 ++++++++++------ .../edu/kis/vh/nursery/list/IntLinkedList.java | 5 +++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index 582cc1c2..ad040a70 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -2,8 +2,12 @@ public class DefaultCountingOutRhymer { - public int total = -1; - private int[] numbers = new int[12]; + public int CAPACITY = 12; + public int EMPTY = -1; + + private int[] numbers = new int[CAPACITY]; + + public int total = EMPTY; public void countIn(int in) { if (!isFull()) @@ -11,22 +15,22 @@ public void countIn(int in) { } public boolean callCheck() { - return total == -1; + return total == EMPTY; } public boolean isFull() { - return total == 11; + return total == CAPACITY - 1; } protected int peekaboo() { if (callCheck()) - return -1; + return EMPTY; return numbers[total]; } public int countOut() { if (callCheck()) - return -1; + return EMPTY; return numbers[total--]; } diff --git a/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java index 07efc0a2..12b153b9 100644 --- a/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java +++ b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java @@ -2,6 +2,7 @@ public class IntLinkedList { + public int EMPTY = -1; Node last; int i; @@ -25,13 +26,13 @@ public boolean isFull() { public int top() { if (isEmpty()) - return -1; + return EMPTY; return last.value; } public int pop() { if (isEmpty()) - return -1; + return EMPTY; int ret = last.value; last = last.prev; return ret; From 635b240603f5fd70b75915c9b0b598f0efbce7cb Mon Sep 17 00:00:00 2001 From: Michal Strozak <245931@edu.p.lodz.pl> Date: Sun, 19 May 2024 22:10:04 +0200 Subject: [PATCH 20/25] 7. Ustawienie modyfikatora final przy atrybutach klas --- .../java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java | 6 +++--- src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index ad040a70..e5c67683 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -2,10 +2,10 @@ public class DefaultCountingOutRhymer { - public int CAPACITY = 12; - public int EMPTY = -1; + public static final int CAPACITY = 12; + public static final int EMPTY = -1; - private int[] numbers = new int[CAPACITY]; + private final int[] numbers = new int[CAPACITY]; public int total = EMPTY; diff --git a/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java index 12b153b9..41855b79 100644 --- a/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java +++ b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java @@ -2,7 +2,7 @@ public class IntLinkedList { - public int EMPTY = -1; + public static final int EMPTY = -1; Node last; int i; From fd0bc64ee341d127b71b4f6f832171c64457cb0f Mon Sep 17 00:00:00 2001 From: Michal Strozak <245931@edu.p.lodz.pl> Date: Sun, 19 May 2024 22:14:55 +0200 Subject: [PATCH 21/25] =?UTF-8?q?8.=20U=C5=BCycie=20annotacji=20@Override?= =?UTF-8?q?=20przy=20metodzie=20countIn()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index 89ffa912..25ea2f84 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -8,6 +8,7 @@ public int reportRejected() { return totalRejected; } + @Override public void countIn(int in) { if (!callCheck() && in > peekaboo()) totalRejected++; From 3bffbb202c212fddab1af972086704edce470c1f Mon Sep 17 00:00:00 2001 From: 245965 <245965@edu.p.lodz.pl> Date: Mon, 27 May 2024 13:34:14 +0200 Subject: [PATCH 22/25] =?UTF-8?q?9.Analiza=20widoczno=C5=9Bci=20modyfikato?= =?UTF-8?q?r=C3=B3w?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java | 6 +++--- src/main/java/edu/kis/vh/nursery/FifoRhymer.java | 2 +- .../edu/kis/vh/nursery/factory/DefaultRhymersFactory.java | 2 +- .../factory/{Rhymersfactory.java => RhymersFactory.java} | 2 +- src/test/java/edu/kis/vh/nursery/RhymersDemo.java | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) rename src/main/java/edu/kis/vh/nursery/factory/{Rhymersfactory.java => RhymersFactory.java} (90%) diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index e5c67683..78a20dce 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -2,12 +2,12 @@ public class DefaultCountingOutRhymer { - public static final int CAPACITY = 12; - public static final int EMPTY = -1; + private static final int CAPACITY = 12; + private static final int EMPTY = -1; private final int[] numbers = new int[CAPACITY]; - public int total = EMPTY; + private int total = EMPTY; public void countIn(int in) { if (!isFull()) diff --git a/src/main/java/edu/kis/vh/nursery/FifoRhymer.java b/src/main/java/edu/kis/vh/nursery/FifoRhymer.java index f50c5e3a..8299dfcf 100644 --- a/src/main/java/edu/kis/vh/nursery/FifoRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FifoRhymer.java @@ -2,7 +2,7 @@ public class FifoRhymer extends DefaultCountingOutRhymer { - public DefaultCountingOutRhymer temp = new DefaultCountingOutRhymer(); + private final DefaultCountingOutRhymer temp = new DefaultCountingOutRhymer(); @Override public int countOut() { diff --git a/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java b/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java index 05f11199..4622b671 100644 --- a/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java +++ b/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java @@ -4,7 +4,7 @@ import edu.kis.vh.nursery.FifoRhymer; import edu.kis.vh.nursery.HanoiRhymer; -public class DefaultRhymersFactory implements Rhymersfactory { +public class DefaultRhymersFactory implements RhymersFactory { @Override public DefaultCountingOutRhymer getStandardRhymer() { diff --git a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java b/src/main/java/edu/kis/vh/nursery/factory/RhymersFactory.java similarity index 90% rename from src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java rename to src/main/java/edu/kis/vh/nursery/factory/RhymersFactory.java index da726cf0..a3f7650d 100644 --- a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java +++ b/src/main/java/edu/kis/vh/nursery/factory/RhymersFactory.java @@ -2,7 +2,7 @@ import edu.kis.vh.nursery.DefaultCountingOutRhymer; -public interface Rhymersfactory { +public interface RhymersFactory { public DefaultCountingOutRhymer getStandardRhymer(); diff --git a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java index b854e2ee..18b8a8c7 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java @@ -1,12 +1,12 @@ package edu.kis.vh.nursery; import edu.kis.vh.nursery.factory.DefaultRhymersFactory; -import edu.kis.vh.nursery.factory.Rhymersfactory; +import edu.kis.vh.nursery.factory.RhymersFactory; class RhymersDemo { public static void main(String[] args) { - Rhymersfactory factory = new DefaultRhymersFactory(); + RhymersFactory factory = new DefaultRhymersFactory(); DefaultCountingOutRhymer[] rhymers = { factory.getStandardRhymer(), factory.getFalseRhymer(), factory.getFIFORhymer(), factory.getHanoiRhymer()}; From 03c3aacf5678ae817ff475baef79bde6b7b918fa Mon Sep 17 00:00:00 2001 From: 245965 <245965@edu.p.lodz.pl> Date: Mon, 27 May 2024 13:36:53 +0200 Subject: [PATCH 23/25] 10.Generacja gettera i settera --- .../java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index 78a20dce..9905ecbd 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -7,6 +7,14 @@ public class DefaultCountingOutRhymer { private final int[] numbers = new int[CAPACITY]; + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + private int total = EMPTY; public void countIn(int in) { From 15ff72ae27aa861fa2bd0d3900ae527c87bfc428 Mon Sep 17 00:00:00 2001 From: 245965 <245965@edu.p.lodz.pl> Date: Fri, 31 May 2024 09:53:37 +0200 Subject: [PATCH 24/25] =?UTF-8?q?11.=20Dokonanie=20hermetyzacji=20nieprywa?= =?UTF-8?q?tnych=20atrybut=C3=B3w?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/edu/kis/vh/nursery/FifoRhymer.java | 12 ++++++++---- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 14 +++++++++++--- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/FifoRhymer.java b/src/main/java/edu/kis/vh/nursery/FifoRhymer.java index 8299dfcf..64b1c763 100644 --- a/src/main/java/edu/kis/vh/nursery/FifoRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FifoRhymer.java @@ -7,13 +7,17 @@ public class FifoRhymer extends DefaultCountingOutRhymer { @Override public int countOut() { while (!callCheck()) - temp.countIn(super.countOut()); + getTemp().countIn(super.countOut()); - int ret = temp.countOut(); + int ret = getTemp().countOut(); - while (!temp.callCheck()) - countIn(temp.countOut()); + while (!getTemp().callCheck()) + countIn(getTemp().countOut()); return ret; } + + public DefaultCountingOutRhymer getTemp() { + return temp; + } } diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index 25ea2f84..657da884 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -2,17 +2,25 @@ public class HanoiRhymer extends DefaultCountingOutRhymer { - int totalRejected = 0; + private int totalRejected = 0; public int reportRejected() { - return totalRejected; + return getTotalRejected(); } @Override public void countIn(int in) { if (!callCheck() && in > peekaboo()) - totalRejected++; + setTotalRejected(getTotalRejected() + 1); else super.countIn(in); } + + public int getTotalRejected() { + return totalRejected; + } + + public void setTotalRejected(int totalRejected) { + this.totalRejected = totalRejected; + } } From 0a82094fe4e0f888c5352b62c621ebfeae1e9857 Mon Sep 17 00:00:00 2001 From: 245965 <245965@edu.p.lodz.pl> Date: Fri, 31 May 2024 10:00:32 +0200 Subject: [PATCH 25/25] =?UTF-8?q?12.=20Usuni=C4=99cie=20nieu=C5=BCywanych?= =?UTF-8?q?=20setter=C3=B3w?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index 9905ecbd..e8f9773a 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -11,9 +11,7 @@ public int getTotal() { return total; } - public void setTotal(int total) { - this.total = total; - } + private int total = EMPTY;