From cb2de2628c4bcf2e85ce5031b9f0fd613b746b37 Mon Sep 17 00:00:00 2001 From: Fenniless Date: Tue, 5 Feb 2019 18:12:10 -0500 Subject: [PATCH] finished --- MathUtilities.class | Bin 2416 -> 2882 bytes MathUtilities.java | 48 ++++++++++---------- PredicateUtilities.class | Bin 872 -> 1054 bytes PredicateUtilities.java | 12 ++--- StringUtilities.class | Bin 1405 -> 2326 bytes StringUtilities.java | 37 +++++++++++---- TestMultiplication.class | Bin 2461 -> 2461 bytes TestMultiplication.java | 2 +- package.bluej | 96 +++++++++++++++++++++++---------------- 9 files changed, 115 insertions(+), 80 deletions(-) diff --git a/MathUtilities.class b/MathUtilities.class index 4ea9860039adf0b48df42a9745fced00444b82a2..2b365353e21674ba7d0a50c3c8d13d6d12c9d894 100644 GIT binary patch literal 2882 zcmaKt%X8CK6o-GxOGcOk0wF*`W5dzEoX-5 zmMsg0nQpsf32gAdOjliXy6v`q3d1?_wQ|uM;f3ziz4v@RI^P`WpO5eV0&oTQEgVA0 z!g+jc;TwEw;R2Q|e20q`F5$98N4__4)x)91B`*mrrlnLF>oB_1wU9x+?^;n@t0=#kIB4#;(0@ zFMD=-XL+q1I6F><_7BzVuCrx(Jt7-x2CSyLz3p_Ic7qm96xY}FunoVxLovp>ftg~h zrf=0+ekb6)8i$q3`d;~I;P6(N!>Uz%tLpi77*;iKvRJ9;dlkP&56FQP1F3GW9(3$R zK!s|$`!3feHJG&N0ZpEE{SGbe^}N9S&3kGft)_0n<}=pt)}doo&F^&@PSp)d`dQU3 zaGlbyaM;B4G;ZLgi4`7KP5i*)EfcqSykp`nk7X10c%(Fsd`2>G^q}UC>bnl7f9zmM zX`uA?*}$W1E<%E+$%8P~VBmOBax-;sEL6faL{S=#{V-3Grtv~o%o7c2PdX6CvL&C$ zB1K)nztbQQI84_x-7V8-&^Uhn9gH_L8Nm^{PK1jSn521nZ~#*{N_SLCOw*Nv@6+i~ z8qK-+U-}q%O;bI5G7QfQj;L@tjN>>FB2CQDY$QaUjF4j(XXHZG?qf8LoJ~Z|M#x$E zL(cM)LRM9lDa!I?A7gQ5Mq{R;G*gr&mkLz48JZ2!JR>k)^f4Z1mJ*qB5pzy4=M^)m zW-edvVeQ2+lVXk#Xl4$$3+9zNIn0>^uX(c~f%!b0RbDJOjb`w&1*_A;0WA1Ht)@;QUD< zGVVMpIrjwTzb7CUqdw26KF>?Th=g&2!?tC%o^PKAQtmNF2 zod1!?96HZo(C1mnd0TM)r-sy>FGhWyQ+=M5ocn_FSBc1>^Be|!o|l}r1m|xPkV}#C zf^wdhoV$Ya4~fX3^MZ1omz=jG=YMNV-T6}Fyr7)tBj*p)_rjW+Z@u_wRd~Dqt5L1! yRcv92T=N&hLP1&2OV)P<>;Gv;-TG2wy`Ze;CF{Qm*8fjL4y_lI^>g8eyZ8xbgF*xV literal 2416 zcma)+&5zPR6u{rGd@Zueez9l~?D`e(Ac^s|#uy|d5LOQ;S2MsY%%qKPL@#;aHV6yuwAirt0@!(lozZ{Cmg{rdXz@7M1Da35~xU=40$;ARGH5lBDa zHuoM9SgX|s1d@-PF(XjuahpAvpAMP(j1Dc_+37hWY7MB%#aeDAy(yoG(?`^sKKHoA zJ3-q(NNoRsGrs*uwQGnqOq1U z#|IRNEdtrueCWA!D==8OY59KUQYRliZi)z$?#aN z@66p1YjeM(7pitw)F}^1NDgQ(0DCpKWyrzN0( zvxHCE!ZDeNvkVq#RaV>Y5OZ__ms5K zf>x5W%Msf0x*aNM;w2D13ivvRx)~ZyTS{8osR65<9w}*Yr-p{pfsz(?YQSozFO;;n zQv+5zohoT@rv|Kc`btTQJ1uKCeXXEfUG!;1_Gwwe=^G_2bXtL+Ps(n6;d*{4+vr=JzHYYV5QbXwJL`b|j- zotn~VRm15IB`tJnN~cu~r@xf6(5We%RyCadR?aQa6{3!R$M>4Efgc5Pf4ib?YYmZUVH>kCV%Ra6sZfg%F6MNQNLa6p7o$UD_?iE^E7jp956l z3MUW;egHoTF`KweAkHPWc6Mj{=Di)i-+zAo0&oZ09vocru!eOP*InEoOzo;zW%miT zzjHuv9wmp8FdwK`KFi;BrS6Ds#FeEW2}N`uv@&^7bh2ZW5>|reS{|xUWb#F(B9$qb z-Xqjh`b0}E>dvu<2@Sv1+6hj?nP^5LK59Npl1Pe}k@TKdi`NJ4+RsGz=BYR>G(43C zGEMsw^?xYa`tiG5M4g1NJU|UqJuS0b#~q#X1gn0z_-r4vC!&;5-hPtnQ0^%+bYpa` zTju^%R50aYql!&z@xK{`5f%o6w!0@X%m|BvQZYNhJrhwb+ph_A|5e!qu?3r5Gmi^0 z!W>=Bn!FS5m7Cu|-}qo*nxpw_;ta=X9{>-toDt_Wj;8q~qix>j*4EGAI$z+}KVW_3 ziao?q>#=P1kp&C)@H^jQp2Gs4EG%+g1=h?1bEBm)kx%1A>XV2pmx+8FFS0R-$V!>W r=kX%`BqFP*7oJ=i>J(NC8+yCP{lB4&(dG*uhnw$~HeX@aEL{BypNE~6 literal 872 zcma)3%SyvQ6g`u^G;M9|)5k*HwIbGq;6f2mtQ3M3tldxRV5h_cCyD4^=}K_n2l!Fq zout@GyGUT}%)R%VleuTUe?Gqe9AeW%0&5wpXRyJLK9P>}PZ<)8W}hK>;ob{|f+Zbs z9Xt+%>hXb1m6GKSx!vbV>U>g6`XlKvRID2%?&XmC;?9@0^ri5Q8S>J*Qi6)AH{uRM zz0v73tucS*Et@+Jt#jA41$PL^UTAe_y)u~6vxMhGl-fUuuDW~*xZQIZ%2U)#)l|X{ zl+#lI-MHFV{IhHXYIEBolzHn0YAD)L4_Tj|V_)Alha^(u!F-#cI31`v7>l8g9T?=W z{xTp(k)oKUtVKJcJ+=D*_D%ESkdG&%CxA#-gKN{=0oOo z)SWOjB9E0&%|L-p2AzvB)M~NSR%57b#a1iDP;10iE2Bd5YTx!~*Z$7?b`YvXjvIfD PS7R`b7BXw$yVQRHtZR7~ diff --git a/PredicateUtilities.java b/PredicateUtilities.java index 4b83a87..501d424 100644 --- a/PredicateUtilities.java +++ b/PredicateUtilities.java @@ -10,7 +10,7 @@ public class PredicateUtilities { * @return true if `x` is greater than `y` */ public Boolean isGreaterThan(int x, int y) { - return null; + return x > y; } /** @@ -19,7 +19,7 @@ public Boolean isGreaterThan(int x, int y) { * @return true if `x` is less than `y` */ public Boolean isLessThan(int x, int y) { - return null; + return x < y; } /** @@ -28,7 +28,7 @@ public Boolean isLessThan(int x, int y) { * @return true if `x` is greater than or equal to `y` */ public Boolean isGreaterThanOrEqualTo(int x, int y) { - return null; + return x >= y; } /** @@ -37,7 +37,7 @@ public Boolean isGreaterThanOrEqualTo(int x, int y) { * @return true if `x` is less than or equal to `y` */ public Boolean isLessThanOrEqualTo(int x, int y) { - return null; + return x <= y; } @@ -45,13 +45,13 @@ public Boolean isLessThanOrEqualTo(int x, int y) { * @return true */ public Boolean returnTrue() { - return null; + return true; } /** * @return false */ public Boolean returnFalse() { - return null; + return false; } } \ No newline at end of file diff --git a/StringUtilities.class b/StringUtilities.class index 71bb6fd8e995b386ae53529bbb1ff3712a34ed87..06765d145bda88889a905c15ac3bec43ae7dc8fb 100644 GIT binary patch literal 2326 zcmai0+ji4d5Z%WYDV9Ybc4BTxo3@1bQWKzs(uSlE(|}tip*RE*dXuFSM^uqqSx(#c zzV-*&59lj>F|2m2en3B?pTSy`&XI&8Y*DV6|vOBaznu5i>y9=A2mbZmwz#Zj+O zODvSSYr0*p$=mzf_C&#P>AIW}8Uv^KVtv#t7M;}@GQ{b&%XiHm7|zBN8XK54?M{#C z5y8#gt{*(1JNq5Y<(uC-ff6L*hcSTvU)ze~SX{G7Ma9ptrCB}Ey8v9YDYWD$^_poI z7O(ATuBLn3WhlkuixL>PiY_%hP5*XH>x6w*32;@YP0ba(?RGSs-{6+HZ+hGaDA6ow zuKOcH{=q1XU_P3DGXf0R9m7ZxC+*NT0O%PPKGFrl-Q<1YO3{V{q!MjxPP(2LC4)bob9&(*#AYytUlB9Jy+$IsLujxk+5Y|pT z8S}!~VVEw~qn#V}%yfILuCFIUp;(XcCAg_L46;l7yPjszd`?B{3kWTicId}{NHZKr z2KhjY;s(i5DDFf{I~-Zb;&$8H^PfBP(~@+W%W%;29e=Ju@*%e+@U(t z-3~o_80Mp821+cJVkdC=Ww4i3!&}JHGgo}FAo3{CdYn!RbfvB%U49JqJ8cp;L965& zC7h(a8aUt-PSYuaY0QvC1fTZr0Lfh95gmyTtwCs(9N)m3q2o=0P0+pkpGa;$MylLL zxYx15FMxaAZbdQ5DF9uw9qy|KrW~PfqI}QqEaY`g!Js}PEuFSI`TS&p9Lo* z4*URq6k@zyLOxa`dsy4!_ujnm%&*@+egeQVs1{%a_HwYFg98THS0WJRh`~y=)?tu7 zRz5OVZ;AjlqvN);rkMg&$;HFLCv6+kZ-bpF_iR+B+#(0 zOU<;s42RsqHz>tG81!8UuH~)heH|>P@e*}tErrp1wAIJIkwQz2w1*90XRG2A#^dwU zcCH9%$Pjhrj={#izP|5Xpl4tQQZ&-`TLl_n$k0Dar#h{S*36^tz`oHY1v&a>qhJ=U z(7xyZkcR@D@+4p*mb?|+5QlxG6PsYJ5^fEy#<)XTQ-pB1$qbb!!=}51b=V-3^-!W6 z%>!wa7iw(JXk44osKE7D<1wwa*m)m&6P2c5GxCv#8%r>sBrW5PZOCtOE5cA%-tv_g9lN^AN~QSYyNBi diff --git a/StringUtilities.java b/StringUtilities.java index b791a2a..eb4376f 100644 --- a/StringUtilities.java +++ b/StringUtilities.java @@ -8,7 +8,7 @@ public class StringUtilities { * @return `Hello World` as a string */ public static String getHelloWorld() { - return null; + return "Hello World"; } /** @@ -17,7 +17,7 @@ public static String getHelloWorld() { * @return the concatenation of two strings, `firstSegment`, and `secondSegment` */ public static String concatenation(String firstSegment, String secondSegment){ - return null; + return firstSegment + secondSegment; } /** @@ -26,7 +26,7 @@ public static String concatenation(String firstSegment, String secondSegment){ * @return the concatenation of an integer, `firstSegment`, and a String, `secondSegment` */ public static String concatenation(int firstSegment, String secondSegment){ - return null; + return firstSegment + secondSegment; } /** @@ -34,7 +34,7 @@ public static String concatenation(int firstSegment, String secondSegment){ * @return the first 3 characters of `input` */ public static String getPrefix(String input){ - return null; + return input.substring(0,3); } /** @@ -42,7 +42,7 @@ public static String getPrefix(String input){ * @return the last 3 characters of `input` */ public static String getSuffix(String input){ - return null; + return input.substring(2); } /** @@ -51,7 +51,7 @@ public static String getSuffix(String input){ * @return the equivalence of two strings, `inputValue` and `comparableValue` */ public static Boolean compareTwoStrings(String inputValue, String comparableValue){ - return null; + return inputValue.equals(comparableValue); } /** @@ -59,7 +59,14 @@ public static Boolean compareTwoStrings(String inputValue, String comparableValu * @return the middle character of `inputValue` */ public static Character getMiddleCharacter(String inputValue){ - return null; + if (inputValue.length() %2 == 0){ + + return inputValue.charAt(inputValue.length() / 2 - 1); + } + else{ + return inputValue.charAt(inputValue.length() / 2); + + } } /** @@ -67,7 +74,9 @@ public static Character getMiddleCharacter(String inputValue){ * @return the first sequence of characters */ public static String getFirstWord(String spaceDelimitedString){ - return null; + String arry[]; + arry = spaceDelimitedString.split(" "); + return arry[0]; } /** @@ -75,7 +84,9 @@ public static String getFirstWord(String spaceDelimitedString){ * @return the second word of a string delimited by spaces. */ public static String getSecondWord(String spaceDelimitedString){ - return null; + String arry[]; + arry = spaceDelimitedString.split(" "); + return arry[1]; } /** @@ -83,6 +94,12 @@ public static String getSecondWord(String spaceDelimitedString){ * @return an identical string with characters in reverse order. */ public static String reverse(String stringToReverse){ - return null; + + String reverse = ""; + + for(int i = stringToReverse.length() - 1; i >= 0; i--) + { + reverse = reverse + stringToReverse.charAt(i);} + return reverse; } } diff --git a/TestMultiplication.class b/TestMultiplication.class index 6f83618b2cad015acaf96a66464544cc0f16929c..5971d6ba3553cfe1943e3f208c17d28005f2f2c6 100644 GIT binary patch delta 14 WcmbO$JXd(b0(Qm+n-{YGVFUmx*ah(b delta 14 WcmbO$JXd(b0(M4+%?sK8FaiK57zI%P diff --git a/TestMultiplication.java b/TestMultiplication.java index ca937b5..770a319 100644 --- a/TestMultiplication.java +++ b/TestMultiplication.java @@ -48,7 +48,7 @@ public void testByteMultiplication() { // : Given byte multiplicand = 16; byte multiplier = 14; - byte expectedByte = 64; + byte expectedByte = -32; // : When byte actualByte = mathUtils.multiply(multiplicand, multiplier); // : Then diff --git a/package.bluej b/package.bluej index 5ded697..d805a44 100644 --- a/package.bluej +++ b/package.bluej @@ -1,20 +1,23 @@ #BlueJ package file -editor.fx.0.height=0 -editor.fx.0.width=0 -editor.fx.0.x=0 -editor.fx.0.y=0 -objectbench.height=129 -objectbench.width=531 +dependency1.from=TestMultiplication +dependency1.to=MathUtilities +dependency1.type=UsesDependency +editor.fx.0.height=709 +editor.fx.0.width=800 +editor.fx.0.x=399 +editor.fx.0.y=23 +objectbench.height=92 +objectbench.width=837 package.divider.horizontal=0.6397146254458977 -package.divider.vertical=0.8697318007662835 -package.editor.height=901 -package.editor.width=727 -package.editor.x=1440 -package.editor.y=0 -package.frame.height=1080 +package.divider.vertical=0.847926267281106 +package.editor.height=545 +package.editor.width=735 +package.editor.x=100 +package.editor.y=23 +package.frame.height=709 package.frame.width=861 -package.numDependencies=0 -package.numTargets=6 +package.numDependencies=1 +package.numTargets=9 package.showExtends=true package.showUses=true project.charset=UTF-8 @@ -27,7 +30,6 @@ target1.height=50 target1.name=PredicateUtilities target1.showInterface=false target1.type=ClassTarget -target1.typeParameters= target1.width=130 target1.x=280 target1.y=120 @@ -35,39 +37,55 @@ target2.height=50 target2.name=StringUtilitiesTest target2.showInterface=false target2.type=UnitTestTargetJunit4 -target2.typeParameters= target2.width=140 target2.x=490 target2.y=70 target3.height=50 -target3.name=MathUtilities +target3.name=TestMultiplication target3.showInterface=false -target3.type=ClassTarget -target3.typeParameters= -target3.width=100 -target3.x=60 -target3.y=150 +target3.type=UnitTestTargetJunit4 +target3.width=140 +target3.x=70 +target3.y=60 target4.height=50 -target4.name=PredicateUtilitiesTest +target4.name=TestDivision target4.showInterface=false target4.type=UnitTestTargetJunit4 -target4.typeParameters= -target4.width=160 -target4.x=260 -target4.y=50 +target4.width=100 +target4.x=170 +target4.y=120 target5.height=50 -target5.name=StringUtilities +target5.name=TestSubtraction target5.showInterface=false -target5.type=ClassTarget -target5.typeParameters= -target5.width=110 -target5.x=500 -target5.y=130 +target5.type=UnitTestTargetJunit4 +target5.width=120 +target5.x=10 +target5.y=210 target6.height=50 -target6.name=MathUtilitiesTest +target6.name=MathUtilities target6.showInterface=false -target6.type=UnitTestTargetJunit4 -target6.typeParameters= -target6.width=130 -target6.x=50 -target6.y=90 +target6.type=ClassTarget +target6.width=100 +target6.x=60 +target6.y=150 +target7.height=50 +target7.name=StringUtilities +target7.showInterface=false +target7.type=ClassTarget +target7.width=110 +target7.x=500 +target7.y=130 +target8.height=50 +target8.name=PredicateUtilitiesTest +target8.showInterface=false +target8.type=UnitTestTargetJunit4 +target8.width=160 +target8.x=260 +target8.y=50 +target9.height=50 +target9.name=TestAddition +target9.showInterface=false +target9.type=UnitTestTargetJunit4 +target9.width=100 +target9.x=170 +target9.y=180