From f63acd0a7d766d3a99391de064c8834a3dd6df20 Mon Sep 17 00:00:00 2001 From: Nusera Date: Fri, 25 Feb 2022 14:24:17 -0500 Subject: [PATCH 1/8] created countYZ for lopp and passed countYZ test --- .DS_Store | Bin 0 -> 6148 bytes src/.DS_Store | Bin 0 -> 6148 bytes src/main/.DS_Store | Bin 0 -> 6148 bytes src/main/java/.DS_Store | Bin 0 -> 6148 bytes src/main/java/io/.DS_Store | Bin 0 -> 6148 bytes .../java/io/zipcoder/StringsAndThings.java | 19 +++++++++++++++++- .../stringsandthings/GIsHappyTest.java | 2 +- .../io/zipcoder/StringsAndThings.class | Bin 0 -> 1367 bytes .../ContainsEqualNumberOfIsAndNotTest.class | Bin 0 -> 1323 bytes .../stringsandthings/CountTripleTest.class | Bin 0 -> 1321 bytes .../stringsandthings/CountYZTest.class | Bin 0 -> 1372 bytes .../stringsandthings/GIsHappyTest.class | Bin 0 -> 1210 bytes .../stringsandthings/RemoveStringTest.class | Bin 0 -> 1308 bytes 13 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 .DS_Store create mode 100644 src/.DS_Store create mode 100644 src/main/.DS_Store create mode 100644 src/main/java/.DS_Store create mode 100644 src/main/java/io/.DS_Store create mode 100644 target/classes/io/zipcoder/StringsAndThings.class create mode 100644 target/test-classes/io/zipcoder/stringsandthings/ContainsEqualNumberOfIsAndNotTest.class create mode 100644 target/test-classes/io/zipcoder/stringsandthings/CountTripleTest.class create mode 100644 target/test-classes/io/zipcoder/stringsandthings/CountYZTest.class create mode 100644 target/test-classes/io/zipcoder/stringsandthings/GIsHappyTest.class create mode 100644 target/test-classes/io/zipcoder/stringsandthings/RemoveStringTest.class diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..184d91897045cbd5c95c564e723aada6c098a711 GIT binary patch literal 6148 zcmeHK&2G~`5S~rab{&Ms0f}Ca_R?DvB`HGmfMh~?=%EtARXG4^?K+~CTyGRR1PH18 z8s#PW96SM!1K<86YDl?8E!vT0zuDQDUHMyk$4f-4H;y|*4I<)Dg%uCYEuzMiu1Ljt zHh@ge@r5oZJxJwQl&(ZO$6aJV?cEj)Nn+<(bYuTygc0>xyn?oVYk@`N(OcSww@-(_ z7V=`VzzcQ+n(}>QNquA5iqoPSZj8Z+<&uEw?dC_kFVwGxbV{?o1II|X$znO_$#E9v zdY-@xaPD#Mq_I7nc6VPiMYq$PHN|wV+ir?yyU%Ack3ZSzygWF)`1)=7eRg@Jc)>S- zk3h>Ki*xt^!;F^61=UXfdnsj3J^1gGOLziO2s#3fS)dIgz2GF-y8iWVpegrfPu5k>km4QE*q;p>Y literal 0 HcmV?d00001 diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..2aba511907468fff377aadb0de65a0a2ca357598 GIT binary patch literal 6148 zcmeHK%}T>S5T0$LZYyFBf*y16R-~;WdJtmOLvKPv4=S42qJfx|Cbej-A&c1^`5}*RBIp06?M=7E0KBAv8|y$%p-0$FYTHEqWoNxUipI*nNHsFXAZ8YPBa(C^}=~6H=CC zd8&NqpQ*l|1z9g`2Hkz?Z3o#|Xzd-P;*lMMyHTfqRGHaONfty&r>m2rb_YWa_M)V% z`c2hK+Nqw$Hv>|ZWa+3fHyAV)SE_EK-WXQh!D^#cb(a>Ghr^Pbov*L8j?b^I2RFmp zJF^!8KU6K#7GL2WjnM)x{caMg`^Eu z|H8}iJ2C^zz>hLO=Yxw%=vmAS>Z1c2T>>D|Z=@Eq^{+poOAbWOVr~#UD8i&7np9y+ z3}Gt=VbXEjv+=n>lMX^Z8RxN27PdkWw(tEy z#|$t7|B3b!Nu^ literal 0 HcmV?d00001 diff --git a/src/main/.DS_Store b/src/main/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..94cdb9918c67d2378416c072c678444e89179639 GIT binary patch literal 6148 zcmeHK%}T>S5Z-O8ZYyFBf<5Nqtw?`F^dQ7q54{NyJ*c#aEjALfrAb?~R`MG9Mm~X$ zqcgkPf>v)LQf6TGo6OE^m~X>whB3x#gLav*JY!6NBBru1d?PrIIwvXPNdt0RqY=n! zFOVKQH_PY{Q$SlqqMLo06uU;?kqqtOhPl`@#wu6O2lM$P=jkql$k4?BI8?6*4*a(V8D zZ8@sRLD-JeI*y(YA}g}Zd|^DURQHNjrCga5t?_=PRJ3-gyOT*)Y;Khg8m+tghwK(~ zZRT#Bs}k>83$z7_f^mt)Sqd2HDu!6RiVL7hz;B@eXd6s4f(L|t1QZQ45Ceb8zz5kC BTI&D+ literal 0 HcmV?d00001 diff --git a/src/main/java/.DS_Store b/src/main/java/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..834a4894b94b3b338077269f3c8d4345086dac34 GIT binary patch literal 6148 zcmeHK!Ab)$5KU^;v?BH(=rI>>McOK&2Vt%C;7wT3gG$}CMHkkMv|EeT%KnD_kze5F z=u9#dw0aUm$_z~2Y%-H&-Y%Jp5JJ{_t*Q_uA%p@&%oSkxMsOWrQdKHp=XiWTJ2jNlF?l((|yCzA4C~0?WaMWsp%jt2Hv`oKl zdP%Em_wn6=QUz6LmX-&D+S+DW*Q&K)Sr4{qm9k!6+ZYZDYH6jqy?=gvcRzR-K0Z1A zCH$aP76?c142Dha*6$>-NiN}e4l}?E{GI_kA2cYU zN0>RZM+XeH1pv&$v=y-N`j0W1&?C$o!U~9Vp@1$_Qi~y7ILvGE^9VDCE?h`zJ|w+a zQime#+hKog-G%fV^2iJ@1D_ed-VdaN^?&c@{@*(Bzzi@0lgWV0H~dB&a--ThmL=9& t4SEiWf_|C9j}S0yDF$CG#mk^pU|ypE=n-ZPVFrXR0+t3In1MfK;2m&YS3v*( literal 0 HcmV?d00001 diff --git a/src/main/java/io/.DS_Store b/src/main/java/io/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..94c166755dc85d489fd42dafeeddd9167650809e GIT binary patch literal 6148 zcmeHK%}T>S5T317w-vDmL63X!R-~;WdJtmOgEt|f2Ng|B(Ll_WHnnK2`em2=JVK)N+qS=e;02Kg`sDyYr8Sw{@BYaoXyb;y7wy z%E?ijM!MhBy)^2Yd3+m?vLs7qmBqoJv9exOje28PRfCO2t*Ta6)`r89Tv)1a?ww!X z-VN@D507RkAn?OAGUspvPiTx0bK`f?M5mV+8`X{S8JPiQfEoBh47e>!&itWg=0{}) zn1P>Rfc6K4O6WPvEt;(Z2h#!|7SU}4ZTe-T8s*S)m|MgMim;`Kwp6$lL)dckE0^av z%q`k-5U%+U?#{w>D8k$w=T{~jglCaQW`G&^%mDR%C>1*YcfardO%e~x05kAE84$%C zf2WCSb7$+=D(S3MsOP98l$Tq4FG0f`#h6P+@gk}b^eZwDJ%_nP^q}yMfT4j0X5dE| FcmpZwU@QOt literal 0 HcmV?d00001 diff --git a/src/main/java/io/zipcoder/StringsAndThings.java b/src/main/java/io/zipcoder/StringsAndThings.java index 073467a..d682d12 100644 --- a/src/main/java/io/zipcoder/StringsAndThings.java +++ b/src/main/java/io/zipcoder/StringsAndThings.java @@ -15,7 +15,24 @@ public class StringsAndThings { * countYZ("day fyyyz"); // Should return 2 */ public Integer countYZ(String input){ - return null; + + Integer count = 0; + + // f e z d a y + // 0 1 2 3 4 5 6 + for (int i = 0 ; i < input.length() ; i++) { + if (input.charAt(i) == 'y' || input.charAt(i) == 'z' ){ + if (i == input.length()-1) { + count++; + } + else if (!Character.isLetter(input.charAt(i+1))){ + count++; + } + } + + } + + return count; } /** diff --git a/src/test/java/io/zipcoder/stringsandthings/GIsHappyTest.java b/src/test/java/io/zipcoder/stringsandthings/GIsHappyTest.java index 020cd3d..9c150d9 100644 --- a/src/test/java/io/zipcoder/stringsandthings/GIsHappyTest.java +++ b/src/test/java/io/zipcoder/stringsandthings/GIsHappyTest.java @@ -33,7 +33,7 @@ public void gIsHappyTest2(){ @Test public void gIsHappyTest3(){ Boolean actual = stringsAndThings.gIsHappy("xxggyygxx"); - Assert.assertTrue(actual); + Assert.assertFalse(actual); } } diff --git a/target/classes/io/zipcoder/StringsAndThings.class b/target/classes/io/zipcoder/StringsAndThings.class new file mode 100644 index 0000000000000000000000000000000000000000..b39123b53340a0824d2f7f8ed6e5fa6a33752d96 GIT binary patch literal 1367 zcma)4+fEZv6kVq??O++?CRK!T5rmc&DvF4pL~JxPDPTf_fy9K=bAK;hx4JKapnHg!-DmLjk`|QiwYwbOszJ2%zUlg`R6ftqc z#d9o-1d)T(0}W}&iRZsm%?m}5{ht7<-`OsS-B}e&$@f z&XqA8y`bAv!wmXo7=ngbt~!FiAB7Zjff+jMf;EViRflW4OT6sTRghv(ZGF$$*FBC5 zGY#m}L3wGv5cFL%sXVXHTtXfoLsYX&hZ|<)(eo-Vd9z#D&WJfITg3l7nn8EJN?VR>sg)8}>?mN7qO|d(GvKm=?RwOI3Ykn;{a*G~Qz!($A@fO1fEa zitaZ@8xCnjZZA*=nK06%-!PpuflGU>^-NO|*Bspz36-qwxTYLS$2Twtg+6xi3xSCV z(Ai9{6y1#O;MjYxcVq;h`bnUY7P3_@0T%ED$?l16GWkr-@vddVGJ^f$)khvB|+F1Bdkm4 zA~`{9BSIAcLIU9hzd}*a&3gL#zfh17aF4J00o?*5zyz84c}=>_2E6E5ivST4EktgV vtN_`4==ag4=?*kRyYHe!yl5SoN0?#YKQI>0!5BQ-<==Va&cV3mDjWI%J`)Fg literal 0 HcmV?d00001 diff --git a/target/test-classes/io/zipcoder/stringsandthings/ContainsEqualNumberOfIsAndNotTest.class b/target/test-classes/io/zipcoder/stringsandthings/ContainsEqualNumberOfIsAndNotTest.class new file mode 100644 index 0000000000000000000000000000000000000000..556ec648ddd0173f22453fac00953e644e289eef GIT binary patch literal 1323 zcmb7DZBG+H5Pr5Tv|JA;MG+Jb3PLH$$&0TTA`nSPnvzJ!0H(EUm(>8~*) zi*q%G)FuTo^p~X)mEfc<+$yiz-UP zUTZ@fIIf_?exXsfy$EWNZp0ftxflk^$NU4gY_1Ni4aczsSCo)zLy5>QVJ!WJy3Ang zI)U2|TT&Ne=Ef^6XlfHV3^0sd*8&rL=x4}M!@LRl=)NW%V=;{-6U$gh95es` literal 0 HcmV?d00001 diff --git a/target/test-classes/io/zipcoder/stringsandthings/CountTripleTest.class b/target/test-classes/io/zipcoder/stringsandthings/CountTripleTest.class new file mode 100644 index 0000000000000000000000000000000000000000..29d3cfe89a19ec698f6f56f4b5783c566258b309 GIT binary patch literal 1321 zcmbW0YflqF6o%jFZA-gKDHr7`1(dcRtALt_F+rjUNtHxMgP+WFJCr45w{Ewj`man> zh$j93f0Xgv?Mll{6ZXUGnKN_V=bSS$zkYxJ31AgZQqVD@VK#*bX8MrETncw_FNt~I zlTV?5ViF5UENZx~VM!p<^jyoXHP`Lx&c1I5OqDFh_+&Lqr>b0I``r4PK;oHYTi$bl zXuePuh;4AAK!3@y)tlB~MY%h&Ql}?da!gq-OV{$}p)=;~TZAl~frLp&yUJB2VQe@p z+uL!i2IExIBQ)MrUaKK6`j#u!p(m9k?Re6&9Gjv9x;5jV#q5k1YR_>M12g7X zt%m|h)ov)$Q&oY%(t$jZMqS!9W7GCjO}T!B()3!g&fp%!Fp=|m%NG$V0;z4M<(lf1 z=PIpT z9+&AJ-FmaBTxOulzIgSL7=}vG6 ziBonA<4m%jB~8$Z;4gSG08d>6Cr-hASAxd~9;fI8L6g@4-?<2mo`O?Xf^!7V5Ijrp M+_k{dtUH3-AHtao{r~^~ literal 0 HcmV?d00001 diff --git a/target/test-classes/io/zipcoder/stringsandthings/CountYZTest.class b/target/test-classes/io/zipcoder/stringsandthings/CountYZTest.class new file mode 100644 index 0000000000000000000000000000000000000000..27178e441080925aa59e674cb2fb937740d251ba GIT binary patch literal 1372 zcmbtTYfsZ)7(MT9Eu+c+CxAzIo`;4x1^4qvVXhDTc%WiFj}ppZM$cmb ziz=2>EGsY+JQOH+zH8YHZ^N$d9fg6wRK;?PGpki|>e4lK|EaGFF${aO=gBFPR(pqP1g#~aWdl{StQXfk;EcQyUr>_7@JOD`}-gE zr00_`>q$Ro35>sI);f_@%d?2MVcU*x`j%r8kYsMdI1Z@Hcr6bdS8`CRB{(a@vFujh zhrP$fSPE!&q3>4s~YH9s($^sI|2R@hCndYN}kAiwJb zZcV(ZJxL)hf~q;3#6l(rvE@{{~YPB$Rrryp9c2z6EVTj zVw};KWh}xR|BLBxD#P69P_~l2K<=IX1(}6!P_`GBE}$mxBisZOlg21ijFD)Zr-_J4 z??A*C6t|?@ezNB#P5A_TU`2YX_ literal 0 HcmV?d00001 diff --git a/target/test-classes/io/zipcoder/stringsandthings/GIsHappyTest.class b/target/test-classes/io/zipcoder/stringsandthings/GIsHappyTest.class new file mode 100644 index 0000000000000000000000000000000000000000..3bc2f6c9eca1a534b197f546063f4959106b1867 GIT binary patch literal 1210 zcmb7@X-^YT6o%j17TQh+C`FMfi)_+G8ChI0CWQnwX)uwdiF~_lujMwwOf!pV{Z}Rm zMiYO4KgxLSbZ`m@Bz&1U>-(I0=FXqLKYs(*#tRK&SW049Lkvr4=vYZ%RXGndtf8Qx zh*An=^?sPbqa@aoFc`9~=SZvVR;*U-SQ!lSRcRYvWVdOzgkv0D%I`3YzLJ*oUNgiC z#X3V`j|v$ks?rh%{z*ePHQq2OlB?QHZq~UYl^+HZ-mxS|`2r*yf?F-h(h$a*ckWx> z?e=TJ^@up)3eWE{@Om4M}UE4MVx2QZjq!FSoC~RI*++xrUZQp5%eW^}7IXw5eBIw9s zl416`mFgJB1kKj#wcEX(j>p(YVpGQ!wv%|G<0+oe3Mi|R&y|x_rTsny7>dKv*DjLI z7ajV2qa&IgL+X4(3~Pm>LGw$*gPdOah1kb4#J?jEX{i4NRGXpNNJkHKW3*6>dOb}(}S*1T|)}@FiX>&bLIlh{1u#Z j#L+Hu=7^*E7H+^lEv?Y literal 0 HcmV?d00001 diff --git a/target/test-classes/io/zipcoder/stringsandthings/RemoveStringTest.class b/target/test-classes/io/zipcoder/stringsandthings/RemoveStringTest.class new file mode 100644 index 0000000000000000000000000000000000000000..715f4d39f9991b68f5c866a2734aec430febcc1e GIT binary patch literal 1308 zcmbW0TTc^F6ouDmOFOh9#ZlxULQyVlxr_o{BE|%bhKH&NG);Um)AmRYDKj`1B>pQC z6{Cqiz#nB?GaYQDpb0NC`|PvN`u1LD=I5_(KLD)beilQR&0sEz1ZD?u3G*5jG!!+I z!c;knMJ#Dp*07?%%;0tgcLat#-&OXmw`n)4tuPRnswl_&pbi>NQ@ZBPsr?Os^dn^} z|FJ-_SgHx6p0ZFNUs1Mv8SK}kTea$KW{ir{u-Y}tRpB~Lru>#7#QX~qH(}XL?y?DU zTkboDvcs-Q&nI=jlYVd@FuonwzS@^HpHGl=@Q??_SiV=Sepdx1!+LJNnMM zT<8_=G_cX56lY2`%}C#Oh?HaMi}dz z0$jr=R{~=^oQMuTL^9gb%iocBeT?L1q`Dg6j|HM~tncdRvCeo*nTRy6|IvIy%_MUp z#z3X~2`M9OWWGRqvAFaVgI#e0DHe^gbc}P2v+0QlQs^9xAxX+k;s%?{bEGLo3D$PT yn~uPRGr-vsaPD026fx5jEf73&A@Ix@;PeStKNmbl@I1i_1Q#y^zR9^0xb+*ujR_9` literal 0 HcmV?d00001 From e5cb0a8925f34df8c4f51aa357e056331fcc0325 Mon Sep 17 00:00:00 2001 From: Nusera Date: Sat, 26 Feb 2022 11:09:18 -0500 Subject: [PATCH 2/8] working on removeString section --- src/main/java/io/zipcoder/StringsAndThings.java | 14 ++++++++++++-- .../classes/io/zipcoder/StringsAndThings.class | Bin 1367 -> 0 bytes 2 files changed, 12 insertions(+), 2 deletions(-) delete mode 100644 target/classes/io/zipcoder/StringsAndThings.class diff --git a/src/main/java/io/zipcoder/StringsAndThings.java b/src/main/java/io/zipcoder/StringsAndThings.java index d682d12..94ef255 100644 --- a/src/main/java/io/zipcoder/StringsAndThings.java +++ b/src/main/java/io/zipcoder/StringsAndThings.java @@ -44,10 +44,20 @@ else if (!Character.isLetter(input.charAt(i+1))){ * removeString("Hello there", "e") // Should return "Hllo thr" * removeString("Hello there", "x") // Should return "Hello there" */ - public String removeString(String base, String remove){ - return null; + public String removeString(String base, String remove) { + + + for (int i = 0; i < base.length(); i++) { + if (remove == base.charAt(i)) { + base = base.replace(remove, ""); + System.out.println(base); + } + } + return base; + } + /** * Given a string, return true if the number of appearances of "is" anywhere in the string is equal * to the number of appearances of "not" anywhere in the string (case sensitive) diff --git a/target/classes/io/zipcoder/StringsAndThings.class b/target/classes/io/zipcoder/StringsAndThings.class deleted file mode 100644 index b39123b53340a0824d2f7f8ed6e5fa6a33752d96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1367 zcma)4+fEZv6kVq??O++?CRK!T5rmc&DvF4pL~JxPDPTf_fy9K=bAK;hx4JKapnHg!-DmLjk`|QiwYwbOszJ2%zUlg`R6ftqc z#d9o-1d)T(0}W}&iRZsm%?m}5{ht7<-`OsS-B}e&$@f z&XqA8y`bAv!wmXo7=ngbt~!FiAB7Zjff+jMf;EViRflW4OT6sTRghv(ZGF$$*FBC5 zGY#m}L3wGv5cFL%sXVXHTtXfoLsYX&hZ|<)(eo-Vd9z#D&WJfITg3l7nn8EJN?VR>sg)8}>?mN7qO|d(GvKm=?RwOI3Ykn;{a*G~Qz!($A@fO1fEa zitaZ@8xCnjZZA*=nK06%-!PpuflGU>^-NO|*Bspz36-qwxTYLS$2Twtg+6xi3xSCV z(Ai9{6y1#O;MjYxcVq;h`bnUY7P3_@0T%ED$?l16GWkr-@vddVGJ^f$)khvB|+F1Bdkm4 zA~`{9BSIAcLIU9hzd}*a&3gL#zfh17aF4J00o?*5zyz84c}=>_2E6E5ivST4EktgV vtN_`4==ag4=?*kRyYHe!yl5SoN0?#YKQI>0!5BQ-<==Va&cV3mDjWI%J`)Fg From 659ea4c53f6eb1b6a44c9183844e7ce102d6d831 Mon Sep 17 00:00:00 2001 From: Nusera Date: Sat, 26 Feb 2022 12:22:45 -0500 Subject: [PATCH 3/8] completed removeString section and passed test --- src/main/java/io/zipcoder/StringsAndThings.java | 13 ++++--------- .../classes/io/zipcoder/StringsAndThings.class | Bin 0 -> 1868 bytes 2 files changed, 4 insertions(+), 9 deletions(-) create mode 100644 target/classes/io/zipcoder/StringsAndThings.class diff --git a/src/main/java/io/zipcoder/StringsAndThings.java b/src/main/java/io/zipcoder/StringsAndThings.java index 94ef255..ea5ba51 100644 --- a/src/main/java/io/zipcoder/StringsAndThings.java +++ b/src/main/java/io/zipcoder/StringsAndThings.java @@ -4,7 +4,7 @@ /** * @author tariq */ -public class StringsAndThings { +public class StringsAndThings { /** * Given a string, count the number of words ending in 'y' or 'z' -- so the 'y' in "heavy" and the 'z' in "fez" count, @@ -45,15 +45,10 @@ else if (!Character.isLetter(input.charAt(i+1))){ * removeString("Hello there", "x") // Should return "Hello there" */ public String removeString(String base, String remove) { + String removeString = base.replace(remove, ""); + System.out.println(removeString); - - for (int i = 0; i < base.length(); i++) { - if (remove == base.charAt(i)) { - base = base.replace(remove, ""); - System.out.println(base); - } - } - return base; + return removeString; } diff --git a/target/classes/io/zipcoder/StringsAndThings.class b/target/classes/io/zipcoder/StringsAndThings.class new file mode 100644 index 0000000000000000000000000000000000000000..ace71dd12611d1e890807c16ae4420d680fc1c4f GIT binary patch literal 1868 zcmb7E+j84f6kW%bt=LtX8wsST8z7L{wbQh;K#7APaa&?=E{rpQGQ&(|<-}3zNUkhr zCVl2Bc%kspSKz^Pc;Ey0q|R_zM{;eMhC)3fX`ijV)?WJ}|NiH%zX7<8&(knaNMi|? z(^$q8b-SvL@1$`J*GKTK^1PSA`?!(D2UyWj)Uhg%T(uqBFA2o6xjg}`?Cwi}v8wIJ ztDlVsb87yf-4?h|wcX{1cFQ8xTdw(@?KIkJ&i?M9GKvB- z!{C$FGlInzB3F0oW?L3ZWY8_QBAS4vXSgzxnw$r}#pkp?}?r$GdR42Dw>i@6G*Il4v(-8gI1|*j z>)9?fN}w`Nh)nE`fB-?Rb{FZ7Z7Tf6n-_>a2lLoMn#; zl<<*`j}5G0-9Q;P4cx-Ij@t%4!G-`=wSrG|d}g4EO&wbXwy`5{{zYpfFg_Sxs8nEL z;OY&Ht8#2MJ97JgYnQE@z8MjwXLC$8rPJ^agYSSlle7*^Z;egY$WdlTZO7kJyxf#Q z&N72c%a@)CXji2lm|C`+ zA#v#!h@WW0G2ROTbWG4T!T?NSilW) ze5MO+{Ny`~hStMJC?h^F`$!{@pO2{{H z@%XRr3qLZQ7KmO%iuM!|lrx6cuz*?qS)Svvp2rR{u;{nxRYhGQMn|1dvy@E1z4DZG z4s$Fgfdk?)h($_PQL5w%yvC6D1GRpU%{fyL7 z7wILXHf-_PAnz57;3~PU^;Hqn*D`@O11-w8Kr6=R6w}NRI~atD4+rrU-tGz5;4{Wt zF)_%fCa)&0>YoYU_A|wLRS#HWeb&YQ!CHN3){Fh6`FE{fz9ef5SyeM~oUeN3{|2jU BeM|rV literal 0 HcmV?d00001 From 662be834ef9ae066a811f20b506597499bf9ab5a Mon Sep 17 00:00:00 2001 From: Nusera Date: Mon, 28 Feb 2022 00:51:41 -0500 Subject: [PATCH 4/8] added equalnumber is not code --- .../java/io/zipcoder/StringsAndThings.java | 50 +++++++++++++----- .../io/zipcoder/StringsAndThings.class | Bin 1868 -> 0 bytes 2 files changed, 38 insertions(+), 12 deletions(-) delete mode 100644 target/classes/io/zipcoder/StringsAndThings.class diff --git a/src/main/java/io/zipcoder/StringsAndThings.java b/src/main/java/io/zipcoder/StringsAndThings.java index ea5ba51..dc36564 100644 --- a/src/main/java/io/zipcoder/StringsAndThings.java +++ b/src/main/java/io/zipcoder/StringsAndThings.java @@ -1,6 +1,9 @@ package io.zipcoder; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + /** * @author tariq */ @@ -31,7 +34,6 @@ else if (!Character.isLetter(input.charAt(i+1))){ } } - return count; } @@ -45,8 +47,9 @@ else if (!Character.isLetter(input.charAt(i+1))){ * removeString("Hello there", "x") // Should return "Hello there" */ public String removeString(String base, String remove) { + String removeString = base.replace(remove, ""); - System.out.println(removeString); + System.out.println(removeString); return removeString; @@ -61,9 +64,30 @@ public String removeString(String base, String remove) { * containsEqualNumberOfIsAndNot("This is notnot") // Should return true * containsEqualNumberOfIsAndNot("noisxxnotyynotxisi") // Should return true */ - public Boolean containsEqualNumberOfIsAndNot(String input){ - return null; - } + public Boolean containsEqualNumberOfIsAndNot(String input) { + + Pattern isp = Pattern.compile("is"); + Matcher ism = isp.matcher(input); + Pattern notp = Pattern.compile("not"); + Matcher notm = notp.matcher(input); + + int matchis = 0; + int matchnot = 0; + + while (ism.find()) { + matchis++; + } + + while (notm.find()) { + matchnot++; + } + + Boolean count = true; + if (matchis == matchnot) { + count = true; + } + + /** * We'll say that a lowercase 'g' in a string is "happy" if there is another 'g' immediately to its left or right. @@ -72,9 +96,11 @@ public Boolean containsEqualNumberOfIsAndNot(String input){ * gHappy("xxgxx") // Should return false * gHappy("xxggyygxx") // Should return false */ - public Boolean gIsHappy(String input){ - return null; - } +//// public Boolean gIsHappy(String input){ +// +// +// return null; +// } /** @@ -84,7 +110,7 @@ public Boolean gIsHappy(String input){ * countTriple("xxxabyyyycd") // Should return 3 * countTriple("a") // Should return 0 */ - public Integer countTriple(String input){ - return null; - } -} +// public Integer countTriple(String input){ +// return null; +// } +//} diff --git a/target/classes/io/zipcoder/StringsAndThings.class b/target/classes/io/zipcoder/StringsAndThings.class deleted file mode 100644 index ace71dd12611d1e890807c16ae4420d680fc1c4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1868 zcmb7E+j84f6kW%bt=LtX8wsST8z7L{wbQh;K#7APaa&?=E{rpQGQ&(|<-}3zNUkhr zCVl2Bc%kspSKz^Pc;Ey0q|R_zM{;eMhC)3fX`ijV)?WJ}|NiH%zX7<8&(knaNMi|? z(^$q8b-SvL@1$`J*GKTK^1PSA`?!(D2UyWj)Uhg%T(uqBFA2o6xjg}`?Cwi}v8wIJ ztDlVsb87yf-4?h|wcX{1cFQ8xTdw(@?KIkJ&i?M9GKvB- z!{C$FGlInzB3F0oW?L3ZWY8_QBAS4vXSgzxnw$r}#pkp?}?r$GdR42Dw>i@6G*Il4v(-8gI1|*j z>)9?fN}w`Nh)nE`fB-?Rb{FZ7Z7Tf6n-_>a2lLoMn#; zl<<*`j}5G0-9Q;P4cx-Ij@t%4!G-`=wSrG|d}g4EO&wbXwy`5{{zYpfFg_Sxs8nEL z;OY&Ht8#2MJ97JgYnQE@z8MjwXLC$8rPJ^agYSSlle7*^Z;egY$WdlTZO7kJyxf#Q z&N72c%a@)CXji2lm|C`+ zA#v#!h@WW0G2ROTbWG4T!T?NSilW) ze5MO+{Ny`~hStMJC?h^F`$!{@pO2{{H z@%XRr3qLZQ7KmO%iuM!|lrx6cuz*?qS)Svvp2rR{u;{nxRYhGQMn|1dvy@E1z4DZG z4s$Fgfdk?)h($_PQL5w%yvC6D1GRpU%{fyL7 z7wILXHf-_PAnz57;3~PU^;Hqn*D`@O11-w8Kr6=R6w}NRI~atD4+rrU-tGz5;4{Wt zF)_%fCa)&0>YoYU_A|wLRS#HWeb&YQ!CHN3){Fh6`FE{fz9ef5SyeM~oUeN3{|2jU BeM|rV From 8ed75509f546828f5e0346f42e06d644293c0b1c Mon Sep 17 00:00:00 2001 From: Nusera Date: Mon, 28 Feb 2022 08:57:36 -0500 Subject: [PATCH 5/8] completed and passed EqualNumbers test --- .../java/io/zipcoder/StringsAndThings.java | 56 +++++++++--------- .../io/zipcoder/StringsAndThings.class | Bin 0 -> 2495 bytes 2 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 target/classes/io/zipcoder/StringsAndThings.class diff --git a/src/main/java/io/zipcoder/StringsAndThings.java b/src/main/java/io/zipcoder/StringsAndThings.java index dc36564..ce8c380 100644 --- a/src/main/java/io/zipcoder/StringsAndThings.java +++ b/src/main/java/io/zipcoder/StringsAndThings.java @@ -14,21 +14,20 @@ public class StringsAndThings { * but not the 'y' in "yellow" (not case sensitive). We'll say that a y or z is at the end of a word if there is not an alphabetic * letter immediately following it. (Note: Character.isLetter(char) tests if a char is an alphabetic letter.) * example : countYZ("fez day"); // Should return 2 - * countYZ("day fez"); // Should return 2 - * countYZ("day fyyyz"); // Should return 2 + * countYZ("day fez"); // Should return 2 + * countYZ("day fyyyz"); // Should return 2 */ - public Integer countYZ(String input){ + public Integer countYZ(String input) { Integer count = 0; // f e z d a y // 0 1 2 3 4 5 6 - for (int i = 0 ; i < input.length() ; i++) { - if (input.charAt(i) == 'y' || input.charAt(i) == 'z' ){ - if (i == input.length()-1) { + for (int i = 0; i < input.length(); i++) { + if (input.charAt(i) == 'y' || input.charAt(i) == 'z') { + if (i == input.length() - 1) { count++; - } - else if (!Character.isLetter(input.charAt(i+1))){ + } else if (!Character.isLetter(input.charAt(i + 1))) { count++; } } @@ -41,17 +40,17 @@ else if (!Character.isLetter(input.charAt(i+1))){ * Given two strings, base and remove, return a version of the base string where all instances of the remove string have * been removed (not case sensitive). You may assume that the remove string is length 1 or more. * Remove only non-overlapping instances, so with "xxx" removing "xx" leaves "x". - * + *

* example : removeString("Hello there", "llo") // Should return "He there" - * removeString("Hello there", "e") // Should return "Hllo thr" - * removeString("Hello there", "x") // Should return "Hello there" + * removeString("Hello there", "e") // Should return "Hllo thr" + * removeString("Hello there", "x") // Should return "Hello there" */ public String removeString(String base, String remove) { String removeString = base.replace(remove, ""); System.out.println(removeString); - return removeString; + return removeString; } @@ -59,10 +58,10 @@ public String removeString(String base, String remove) { /** * Given a string, return true if the number of appearances of "is" anywhere in the string is equal * to the number of appearances of "not" anywhere in the string (case sensitive) - * + *

* example : containsEqualNumberOfIsAndNot("This is not") // Should return false - * containsEqualNumberOfIsAndNot("This is notnot") // Should return true - * containsEqualNumberOfIsAndNot("noisxxnotyynotxisi") // Should return true + * containsEqualNumberOfIsAndNot("This is notnot") // Should return true + * containsEqualNumberOfIsAndNot("noisxxnotyynotxisi") // Should return true */ public Boolean containsEqualNumberOfIsAndNot(String input) { @@ -82,10 +81,10 @@ public Boolean containsEqualNumberOfIsAndNot(String input) { matchnot++; } - Boolean count = true; - if (matchis == matchnot) { - count = true; - } + return (matchis == matchnot); + + } + @@ -96,11 +95,11 @@ public Boolean containsEqualNumberOfIsAndNot(String input) { * gHappy("xxgxx") // Should return false * gHappy("xxggyygxx") // Should return false */ -//// public Boolean gIsHappy(String input){ -// -// -// return null; -// } + public Boolean gIsHappy(String input){ + + + return null; + } /** @@ -110,7 +109,8 @@ public Boolean containsEqualNumberOfIsAndNot(String input) { * countTriple("xxxabyyyycd") // Should return 3 * countTriple("a") // Should return 0 */ -// public Integer countTriple(String input){ -// return null; -// } -//} + public Integer countTriple(String input){ + return null; + } + +} diff --git a/target/classes/io/zipcoder/StringsAndThings.class b/target/classes/io/zipcoder/StringsAndThings.class new file mode 100644 index 0000000000000000000000000000000000000000..f505b9cdab5c186963a04e0e62ac4b3eaac72b9b GIT binary patch literal 2495 zcmb7GT~`}b6x}zOWI{TWLJJiuU_YclpwWI{3y7tmAE^n@2C1~xG7Li)8fL;|!jeAs zPw0!SFTAP`*yV#i!2hEUT}$h}Gea^6)+H=v?mhRMbNAV2pIQ9&*Dt>UxQwkdIxv~W zr?{TR6mG~zPHv~uxQSaS+?JL*Ey&|;8lRz%LNSdQ%*w}H3ir~uk5U@*_*}(;iU$J8 z3Cp&;NrCvl;DUgXb5=}&wt{7wGxd#S)1B9sE3|YJ97C@x=&mLAp;7VHteQY?!E&Dh{Im&3cp2P3Au?U`lMWsI=+mlsG_cD3%w5)K6N&`&IIJaX7f(OU9!<7rW^`UR`_ zLO^rP4QI;?suZ|-2%Jc&z-=GE&_u3fb?iWpP@uOx@WBU>?yY6F^PQ9Q{9jU zve_wrMXRr%MHLTKJfgXruieqB)opri>W@VM8gtzvWzDx3=Jz_I5e!H ztYS@rg>@BAHB`X5Vpfe6Xt3dEsA7}c`K3M5;DSe<%v=|E?`;YfIM!5FP?11;(-i7y zpWB{(PWo;Kdn9n+BA=05%Fr`>zNN$jGr@Cgfq8p5uj!Is}l+4Y#X&dHvq>KCPQH%}w zM>s2O*F2Nmh&yslJA*W2e2!ldj{&B>K~)Dx_nV2UDxE4eX*L#vj(;`e|AMg$Q~s_fsxC^vf(jMHf6mtOuP!NPHZ z&ra^9_@H zB)>)1AuiA3V&~1v;U9RN;)Cu-3)fvp5M&!p;VglT5Lynsm_r{7+AW;(iyC5#%8Bl! zJuU%<<;m6iWQ*T%&i5JSh($`4Ub5tK{A)wvPpB$B5U2Y3UejHmALm0JYD}uosXa5? zq3$9z^AlP|c99;DXakCm`uAQ$3YVDcN&^*x8d%yf;A4@tL9Sx-Zs9ej8QW}x^bZ;_ zgiHWH^!mO)q2tIaXvJanp>?L?DA!|3w<33AiTG$TKB^K{+c#)=o+O)pbSJ`{%H8js z$xihJRAmPW`+2O%^aUJY9n);}P0HgI^>mvE@?`Tau@#8AhzsO=6!$Q}e-5OK?h`xl zG-@k^JSQ1H%s$1K={lpbtnE0i;X~RKX8nl2S<>6fvy1Fjk~d_?Ss(k?&zJ> z-q0zf;Dn?a&96SZ3uC=DGOU+;1;|h1UixFE)G`l0G1TcN%UBPJsc`QWUygk Date: Mon, 28 Feb 2022 21:41:55 -0500 Subject: [PATCH 6/8] passed gIsHappy test --- .../java/io/zipcoder/StringsAndThings.java | 36 +++++++++++------- .../io/zipcoder/StringsAndThings.class | Bin 2495 -> 2662 bytes 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/main/java/io/zipcoder/StringsAndThings.java b/src/main/java/io/zipcoder/StringsAndThings.java index ce8c380..a79f999 100644 --- a/src/main/java/io/zipcoder/StringsAndThings.java +++ b/src/main/java/io/zipcoder/StringsAndThings.java @@ -65,23 +65,23 @@ public String removeString(String base, String remove) { */ public Boolean containsEqualNumberOfIsAndNot(String input) { - Pattern isp = Pattern.compile("is"); - Matcher ism = isp.matcher(input); - Pattern notp = Pattern.compile("not"); - Matcher notm = notp.matcher(input); + Pattern isP = Pattern.compile("is"); + Matcher isM = isP.matcher(input); + Pattern notP = Pattern.compile("not"); + Matcher notM = notP.matcher(input); - int matchis = 0; - int matchnot = 0; + int matchIs = 0; + int matchNot = 0; - while (ism.find()) { - matchis++; + while (isM.find()) { + matchIs++; } - while (notm.find()) { - matchnot++; + while (notM.find()) { + matchNot++; } - return (matchis == matchnot); + return (matchIs == matchNot); } @@ -96,9 +96,17 @@ public Boolean containsEqualNumberOfIsAndNot(String input) { * gHappy("xxggyygxx") // Should return false */ public Boolean gIsHappy(String input){ - - - return null; + String gIsHappy = ""; + for (int i = 0; i < input.length(); i++ ) { + if (input.charAt(i) == 'g') { + if (input.charAt(i-1) == 'g' || input.charAt(i+1) == 'g') { + gIsHappy = "happy"; + } else { + gIsHappy = "sad"; + } + } + } + return (gIsHappy == "happy"); } diff --git a/target/classes/io/zipcoder/StringsAndThings.class b/target/classes/io/zipcoder/StringsAndThings.class index f505b9cdab5c186963a04e0e62ac4b3eaac72b9b..8deafcaf6812d8fe48ab00f3520d8a9d719d23cf 100644 GIT binary patch delta 1088 zcmY+C$xjqf5XOIRx_e$vrwK6Q0sQ&eKzWVCbx7e>`19N}Bd8~67;&9_Bg{?W6rsp_qf1Ck4s#3x#DtFb4_#o{k82% z-N-*zZ|yUR>U_UbqpeIXVf>d)ZSz=mLgKb;64Il|iPT7EPT>Y#Z+0R;>C^OUZsun~ zQ`5^?p}FBRKvL7^bBmNunn9l-Qkr3(5i$yVZgWR-*JqS5P1a|edx}sdCtyDJ$@xt1 zKw$~Dfcre;k>;^Mo>Vv^$?`FOx z$S%w{n?Ir6i(^q$OahN;@%=&qtEiDv?SGLvIVo0CFLq`AQuv9g%6|{X2h6?A*l5wZ zh6X`}J4FQJHL_N2IHG?Y>j^DEHCYCAgRF9#KWNQHRa0O8ThbMqXbPzMb)!%{)v@jp z6;v(|R0_EvFtNCJAzUJIcdZn%D8S?w1T?cHK>exv1ofcXGHp=L$t~zvKMXA z7>`6N6SIV)(Zn-L&Cbs?M=Rf;?OAN=GZpUy&<>uzaXOHm5|%V&49chsiMU}Ak)c&$ zhh#!ajdw(P>5UT$%}NxTWzi*dnLNbq6qZYD>D3Q1VYLG=mT!IUt#)U;?5!rnwVZ$TF zH6w<{Oc*AaGE6g}nK8^Vr@-)pdCh{sXHm0cc#2RsepbK?Dbj`&Rz*j^GG@piTRDsT zOtH^T$JhLone^;jCO(+U_^J79Pil7P-J8&eGhHEfWIquUB1mGjR6Vi^GvVg&i0xlb7Z<)kQ(LerX4$9u+vOS!0}y=i=BSAecjp_kW-K>p(cwaBJ^^c6M||; zaFV#7R? NaL&r3oAbeX;SV#1X5jz; From 06a08ddb79b40416f24a85e18fefbcf98302ff9d Mon Sep 17 00:00:00 2001 From: Nusera Date: Mon, 28 Feb 2022 23:00:44 -0500 Subject: [PATCH 7/8] passed count triple test --- .../java/io/zipcoder/StringsAndThings.java | 15 +++++++++++++-- .../io/zipcoder/StringsAndThings.class | Bin 2662 -> 2795 bytes 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/zipcoder/StringsAndThings.java b/src/main/java/io/zipcoder/StringsAndThings.java index a79f999..d999f6d 100644 --- a/src/main/java/io/zipcoder/StringsAndThings.java +++ b/src/main/java/io/zipcoder/StringsAndThings.java @@ -118,7 +118,18 @@ public Boolean gIsHappy(String input){ * countTriple("a") // Should return 0 */ public Integer countTriple(String input){ - return null; - } + int count = 0; + for (int i = 0; i < input.length()-1; i++){ + if (i < input.length() - 4) { + if (input.charAt(i) == input.charAt(i + 1)) { + if (input.charAt(i + 1) == input.charAt(i + 2)) { + count++; + } + } + + } + } + return count; + } } diff --git a/target/classes/io/zipcoder/StringsAndThings.class b/target/classes/io/zipcoder/StringsAndThings.class index 8deafcaf6812d8fe48ab00f3520d8a9d719d23cf..8720ba40d2b00bf1a0adafc83e37fce0f8d90aaf 100644 GIT binary patch delta 233 zcmXYr%Syvw5QV@05-V+SRk61HL90Y)_Mu=CDM+6~p)cXJoBAH&#%)%?C+M!P;l?)* zik>88m^p`U4#Rx+evXSyd$q-@VBs>Chor>$ev3q<$ddjB{M|2m^-F%8j|e j=)^6T+FC}UU6Cdgq_Mh#+u@B#e~A>D30X4oT5tXV@x&nC delta 99 zcmaDY`b=a4H&?U=10w?y0|NsS;|3tf%pd_I*??jU43!L$KvE1M%OJ%d4demUF(@%8 a1Lb9aY#y*WCZL=wSjGlS+A`RIX?p Date: Mon, 28 Feb 2022 23:28:20 -0500 Subject: [PATCH 8/8] checked variables using debugger --- .../java/io/zipcoder/StringsAndThings.java | 8 +++++++- .../io/zipcoder/StringsAndThings.class | Bin 2795 -> 2795 bytes 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/zipcoder/StringsAndThings.java b/src/main/java/io/zipcoder/StringsAndThings.java index d999f6d..86881d6 100644 --- a/src/main/java/io/zipcoder/StringsAndThings.java +++ b/src/main/java/io/zipcoder/StringsAndThings.java @@ -119,8 +119,14 @@ public Boolean gIsHappy(String input){ */ public Integer countTriple(String input){ int count = 0; +// int length = input.length(); +// int lengthMinusOne = input.length()-1; for (int i = 0; i < input.length()-1; i++){ - if (i < input.length() - 4) { +// int lengthMinusFour = input.length() - 3; + if (i < input.length() - 3) { +// char charAti = input.charAt(i); +// char charAtiPlusOne = input.charAt(i + 1); +// char charAtiPlusTwo = input.charAt(i + 2); if (input.charAt(i) == input.charAt(i + 1)) { if (input.charAt(i + 1) == input.charAt(i + 2)) { count++; diff --git a/target/classes/io/zipcoder/StringsAndThings.class b/target/classes/io/zipcoder/StringsAndThings.class index 8720ba40d2b00bf1a0adafc83e37fce0f8d90aaf..be9af00d18c93c9e4bc91b9b171ae590cb313038 100644 GIT binary patch delta 43 ycmaDY`dV~@Iu|3`WDPD?$r=VehB^ibh9(AehGqr}h86~Eh8hM(hVIF2T&V!+E(#w2 delta 43 ycmaDY`dV~@Iu|4RWDPD?$tnguhH3^0h8hNShFS&-hB^johAIX}hSte#T&V!)Y6<}W