From 49e05f7cba17c5f813c962b50676804dcea7e417 Mon Sep 17 00:00:00 2001 From: Marcus Ikdal Date: Tue, 7 Jan 2025 15:42:31 +0100 Subject: [PATCH] completed --- bin/main/com/booleanuk/core/Exercise.class | Bin 0 -> 2204 bytes .../com/booleanuk/extension/Extension.class | Bin 0 -> 1028 bytes .../com/booleanuk/helpers/ExtensionBase.class | Bin 0 -> 735 bytes .../com/booleanuk/core/ExerciseTest.class | Bin 0 -> 3115 bytes .../booleanuk/extension/ExtensionTest.class | Bin 0 -> 1595 bytes .../java/com/booleanuk/core/Exercise.java | 57 +++++++++++++++--- .../com/booleanuk/extension/Extension.java | 24 ++++++++ 7 files changed, 71 insertions(+), 10 deletions(-) create mode 100644 bin/main/com/booleanuk/core/Exercise.class create mode 100644 bin/main/com/booleanuk/extension/Extension.class create mode 100644 bin/main/com/booleanuk/helpers/ExtensionBase.class create mode 100644 bin/test/com/booleanuk/core/ExerciseTest.class create mode 100644 bin/test/com/booleanuk/extension/ExtensionTest.class diff --git a/bin/main/com/booleanuk/core/Exercise.class b/bin/main/com/booleanuk/core/Exercise.class new file mode 100644 index 0000000000000000000000000000000000000000..d3136b488d7c849d49a526fd1df6abcd8cfd51e5 GIT binary patch literal 2204 zcma)6T~ixn6n-|lNj4#YG%fhCr6pBs041VmRq%siOH=uf!qgdXoLQ2WWJ}nkn*@qq zis^;@FSQjnOkY^(LI0<}1N zQ-L<)R7DypQW?aNP|!DL*q#A_6l7)K&{j9HpyRZHl=rG??iFZT%>YGN zW%zQ-tZdGk+dd=Ju}St!F#?{=wssu_@mAdx4AM57wkr>7ho0KB?nq+gh)f+r3iKJr zbtxV>U7&y;yN+EWA=PegDNxG9ZHgUX6Hv~AuCQu#Nk z7uU+e>`mi)svBD)xZ0A?{l!OB8(!7%DucJI#%3B5cq56||1fv#}wiPPBGKL#mvh z7+!DjhO;ZEe!RWCEl-`Bc!as_C(z(UV^NCVwy zABlN5gMMNRcv(u4=2Li@PYM1qPme?wHOy-?#7hl$Jrj|dlZ3*lP{gOOd*5k zIG4faqE z^^gjxq_~S?gb1x^39tCrH;62;v!nU(Kk(XqB)&uOw~2i_gr5!Yvv><{ALIAXoWzum z|Ba77c7)$Int#VDl*pwHkL?6)pFkqq;5qLy?IDlPIEc@=H(&5)@FnH?iu!yVA~Y5d z8VeDML+$TLlgxW~-=|a~C5N{ntl?dt8+dI)-+@y-7ZxbG2jW2l4`Bq<5`j;b{2EeaBA`5h1#j8p8YG}4Gud7;T%;Gn GNB;uRvO1jr literal 0 HcmV?d00001 diff --git a/bin/main/com/booleanuk/extension/Extension.class b/bin/main/com/booleanuk/extension/Extension.class new file mode 100644 index 0000000000000000000000000000000000000000..6eafd4c7fd3f76539a9d96a345a193e7c1e54ec5 GIT binary patch literal 1028 zcmZuvO-~b16g{t+|r^2-|i*&gyy6OSG*Eq(i%_{8}i(K5KHN zot5fa`A$|G>9#7h(6`;zdJ5B|+G{JTAv?;l1It&kd00$gMxdbYBM|F=@`JW&TC$}A z8jl${frbAogV1&yt1dePE()Y{WmO%70%AvCf{FuCqiS2Ru{jakI_#r9wC{{94~&P%N}QEk9ir7fbs-k0$H;xnIYgT0rC-W zeo#yT4Xm^Bm?PvoV*@c$i&((bA=xWt>kiU|BP0@=t0#r_Hy#HxlhM;M%SzO~8o^tG z^bvd-izpC`5V%I7SVR^Qa)5*(87lpG->n+3CE5rlXMkR>ZYa+D3L_PB65%){#GLFAuU zzzT^4AHYW;Zrc`biEOI6rt6-ry7Tqh=Pv*r<5mNa;C51E@wg~bHF@k7k&dggArzW4qN8>Y1ykPZ#&8>eZSn2go1huEdL|a%va~*Z83O0u} z*TX6st2;L1R0W-3k(l(vI2-Ea$C^L2rQpu+0;3!V+TLdBM&9^}s-51TKm0k`$UB=) z57uy5aOJS@U7O8P%{2Eq>7J|K7c`w_hJ)u*feg5qmLwXlFP+Yg$rkMOUj5A+^x52| z%<04u$j7(;(I%*e0mEoqHK|gPUpSMMN3TcK)HvFfnsa(AXpM@>CHmaXt@+LJdtoK) zgWmFI0X3fJDPx0G%q-0HyPvT3k%tH^#&8V^+KlUq2IdV`f=k$B4C4FDQRwSzePH@k zTAxdI7uQQ^0CuoV5go$U LU(#;O**Cufli`b_ literal 0 HcmV?d00001 diff --git a/bin/test/com/booleanuk/core/ExerciseTest.class b/bin/test/com/booleanuk/core/ExerciseTest.class new file mode 100644 index 0000000000000000000000000000000000000000..86720a0cfe24e95acb4dc5cb32e001e575ff56a1 GIT binary patch literal 3115 zcma)8Yf}?f7=9K)vV;x9h*rc)ytF3J8fjH*QCmPz6rn=I0^T;sAuNVn-E6q@X8Wbn zAK)+OFKB04bXuqNbAME)&)Hozn{h`ShMj%Rd(QJd@9k{<{qN7e0gU3u1lklFEnDk_ zl4aF|ZZ;kj%9bq(6I;SA8+B0>bti$Cg7licp%-epSuM<#)F`)tVyoExrXT&>teyE8zdVwP0P_8 z!!pTrXxg%?g|!C5;q$TK2)m#^HVQ6{ias)3wX90EqHiCQvimh0!eIt(N#@>Me!7{+ zdB--)>PQktaV&wXf^0PRXuU3M*T072IH5q(-Ia+a4ZTK9r*a`uuR0^IugJvvQ5H8X z6(1-_xl-3H+oTRxZcanqmFsL;3c9?c6jyD*a%uQb!$;EE;m8#QNzXoMHEd}qUPlU6sj6zt1QMPy9{+bMp> zwx~Q%IxjYaDW!~R7{fS~*5!)iSc>2X&P^EARY#ti)NmEocuvR_1^aVTQO<+lX4r@F z+zk!WxXI9&Ne0)ETb{}<$->TR_!76|ez#;ryFqh|Y8Iq*UPDn@yFBY8%h^m#QJ5<3 zaJZ(jrVy2^V`WQ??d-Zydz979O15mRtax=<)UbqQ=F9P74He(-vHX&Xd+gp;Do5xc zCfQf+5KPo$(o{U;ShXIIzGb*24P{iAf8lPG`Hk>7B|}`1JzJG2VI~(;7@UGuQZEh_ zj}#niwdmOmqav(qRbOXXe09Z5QS&;=)L`K;RXFYvU+9B*SJ1uNxQ6Wr849N)Hl~-h zrTB)14cT2PZwKGZE=v@xN~I=j6<<^A_^MH>sQ8wvi_dPp^RDBwlW2@qX-f}0M{?jVXp7I${Ret}<60Z` zxclY#PQ;Kz54w;c(!4X+i(VpToqTQB&-Xadd+vU4blTi~smy_a-_f&!gD-HTNt~n^ zq|}fOk){IDlW!q?-y=O0LE1~weUYRC??yTpLE1;sgOQ}C-;J~oL3)IwM8jgpD-I+9Gmq#r)roIE`$UO1p=lb1uS#=q=39kY5Zk!u{}P!7)$ffkxtC+ z;Q9;9NK^aEqzmSnj=iWaq92!-=F1_c`M~MzNT)aa0qm2^nS~vE<$KB8b>CleGRDRk z#{pakIq3_W+>dnf#IN9R-1YKc2l@+$w1-xG)VZrb+S*;P=9!vt?q`aCYpm`RW4+FH zy1`UWholS#QfiS>p7~XtlMYmsC0_RfR^w?lZh+Jl6c2Aq`^e*nd#6H)I>O5n{FJ6} ziz?@+a-J%SOxbO&EQHj~1!|u}sa1~qiF=i?rCzqaBO7v40=9k=bc6w?v1y??7i_x$ zhk@+hrYWuY=o`5)ooYe6nBAS8ZLg2Mb9eT(pllfJN&M`=W(6NbVH#G8&_ zFzQ~5JImac%I-TeVMhiG$989`L=)Sz=MvV~y~qt^S1ijw64<=!dLa*~NrW{~_x!fC z7Lh1AH)JS$i*HCP2GB4@OqM#rZ1Htr%E0smUwKki{154vz+r}Ah3wk|7!ln5O08NS z^w|!5>9*$z_z~qiOa^o3YV$!L{FsrBNlY>5JoYR;h`6H^R}!GT;m!TuQ(e|DLvoXZ zgHSq-+2rfQqpaZ=DOTZ_w7E*N3_4=P#0t}iy0sC5jZ zmHP=T{g&0LHPy9WR6l5t*-EXZ_AMKBd=Ud))p1P$?x!_rMXJoNKJNy1R&7O#p;FUgm} z2%UT5_lM}c0*V-hK|a0r4t~HsvWOnxrEq|rb7YOuzry~bkG)_Voc$Zc^lOa2#Svp# z8JVO}8tq$0RVbA-O8@k%0iW?$MG<>Y!Zl(5m#9Y?mD=2ETu~ZVc8s4?Jy7ux zeA=GSZx>0A6WEDF0>v__i-`&&?9c59)OD4R?;#9i_XcgMuL@m)N&JQ>{Elh-g_(r( N7n{ 7) { + return "Correct!"; + } else { + return "Wrong!"; + } } // 7. Use a conditional statement to return "Correct!" if the input is false // or "Wrong!" if not public String seven(boolean bool) { - return "Not implemented yet!"; + if (bool) { + return "Wrong!"; + } else { + return "Correct!"; + } } // 8. Use a conditional statement to return "Correct!" if numOne is more than or equal to numTwo // or "Wrong!" if not public String eight(int numOne, int numTwo) { - return "Not implemented yet!"; + if (numOne >= numTwo) { + return "Correct!"; + } else { + return "Wrong!"; + } } // 9. Use a conditional statement to return true if the array provided is not empty // or false if it is empty public boolean nine(int[] nums) { + if (nums.length > 0) { + return true; + } return false; } @@ -93,6 +108,8 @@ public boolean nine(int[] nums) { // "milk", or false if not // https://www.w3schools.com/java/java_ref_string.asp public boolean ten(String sentence) { + if (sentence.contains("milk")) + return true; return false; } @@ -101,12 +118,22 @@ public boolean ten(String sentence) { // Return the number 9 if the string contains both coffee and milk. // Otherwise, return the number 0. public int eleven(String sentence) { - return -1; + if (sentence.contains("milk") && sentence.contains("coffee")) { + return 9; + } else if (sentence.contains("coffee")) { + return 6; + } else if (sentence.contains("milk")) { + return 3; + } + return 0; } // 12. Use conditional statements to return true if num is more than or equal to lower and is // less than or equal to upper, otherwise return false. public boolean twelve(int num, int lower, int upper) { + if (num >= lower && num <= upper) + return true; + return false; } @@ -123,6 +150,16 @@ public boolean twelve(int num, int lower, int upper) { 20+ | Adult */ public String thirteen(int age) { - return "Not implemented yet!"; + if (age <= 0) { + return "Baby"; + } else if (age >= 1 && age <= 4) { + return "Toddler"; + } else if (age >= 5 && age <= 12) { + return "Child"; + } else if (age >= 13 && age <= 19) { + return "Teenager"; + } else { + return "Adult"; + } } } diff --git a/src/main/java/com/booleanuk/extension/Extension.java b/src/main/java/com/booleanuk/extension/Extension.java index 44e540f..d5a4a3c 100644 --- a/src/main/java/com/booleanuk/extension/Extension.java +++ b/src/main/java/com/booleanuk/extension/Extension.java @@ -13,6 +13,15 @@ public class Extension extends ExtensionBase { "The cake is still baking!" if there are any remaining minutes left, and "The timer finished ages ago!" if the remaining minutes is a negative number */ + public String timerStatus(int timeLeft) { + if (timeLeft == 0) { + return "The cake is ready!"; + } else if (timeLeft < 0) { + return "The timer finished ages ago!"; + } else { + return "The cake is still baking!"; + } + } @@ -26,6 +35,13 @@ public class Extension extends ExtensionBase { provided and the prep time per ingredient. If a prep time of 0 is provided, the method should assume each ingredient takes 2 minutes to prepare. */ + public int estimatePrepTime(String[] ingredients, int prepTime) { + if (prepTime == 0) { + prepTime = 2; + } + + return ingredients.length * prepTime; + } @@ -40,6 +56,14 @@ public class Extension extends ExtensionBase { You may need to use programming techniques we have yet to cover in the course to solve this task. */ + public int calculateGramsOfSugar(String[] ingredients, int layers) { + for (String s : ingredients) { + if (s == "sugar") { + return 100 * layers; + } + } + return 0; + }