From e1e2df45dbbb7682e869224d525875dd99c60643 Mon Sep 17 00:00:00 2001 From: Yash Ugrankar Date: Sat, 29 Oct 2016 16:26:08 +0530 Subject: [PATCH 1/3] Move default test case to base class. Issue #13: Defining a new variable in each derived class to store the same default test case seems redundant. Therefore, I have shifted this test case into a static final variable in the base class. --- .../classes/random/text/generator/Gui$1.class | Bin 0 -> 515 bytes build/classes/random/text/generator/Gui.class | Bin 0 -> 2089 bytes .../text/generator/RandomTextGenerator.class | Bin 2421 -> 3410 bytes .../generator/SpaceEfficientGenerator.class | Bin 2566 -> 2535 bytes .../generator/SpeedEfficientGenerator.class | Bin 4096 -> 4065 bytes nbproject/private/private.properties | 2 +- .../text/generator/RandomTextGenerator.java | 16 +++++++++++++++- .../generator/SpaceEfficientGenerator.java | 15 --------------- .../generator/SpeedEfficientGenerator.java | 15 --------------- 9 files changed, 16 insertions(+), 32 deletions(-) create mode 100644 build/classes/random/text/generator/Gui$1.class create mode 100644 build/classes/random/text/generator/Gui.class diff --git a/build/classes/random/text/generator/Gui$1.class b/build/classes/random/text/generator/Gui$1.class new file mode 100644 index 0000000000000000000000000000000000000000..2cb0a3ed2820e055fe1602e80f9ec47ed679dde0 GIT binary patch literal 515 zcmZ`$O;5r=5Pe$;Eww75qDZ`P01sA-#skI+QDagy5rZ+F7TCa&vQ4(F@o#w|(ZnC% zk1|eyh!+mKZ)V=kn~(ke`S=2Gf{KGIwk&KrFj6d8*s-w7kUN)3#up5kTD`+yw!*$( zSoft8cgeUb^ds*E6e;>)j|UyDW$Mp^W;~P;gL|Wt(5-++ksx>9*If0(u@{TC*c%Aq zcpPf)I+4{zlPc*%F*xlo(LHe`Q+1oT!x4YwRQgi&f-sV5a4X_r*mqIJo(l^$LwTt% zLuDyfZ7>v4aWCL%;N5peq8HOdi_k-&)ND+1%q2Bfs=fFNx*cn3r&;gd2qx{3wnj@e z=ulVW<;n608DaKd0`@+o9lCSV;4xOnc4rR=*T|zu|B}y0EKSaT!g!t_^Ry61|114K e8>jz7@^g_43d9=NK#|ZSYZI$vIV5Ki0`@PX?PntZ literal 0 HcmV?d00001 diff --git a/build/classes/random/text/generator/Gui.class b/build/classes/random/text/generator/Gui.class new file mode 100644 index 0000000000000000000000000000000000000000..60e263c73494dc3f87e8a78cb7c1dfee1548b20b GIT binary patch literal 2089 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 Sea!Xg;yX>K!yrQ+p7|S(o7Btz delta 825 zcmZ9K&sWS*7{))}X>_M=w?i{dQ7Wa;^vgsEB_v@oM3X4_G1W-Plx9julVACfqBB-@ z*;%G@EG#T6E&UDF&atp@oOo}}aSog3zTfvg@AEwG-1(gI-JSTf^8N!*!-7pA!8B4i z?&5@vhgS1(QgKSrW}^ryLN;jx4YVsx+h{t>%^6#mXKgy^GH}j7x8l6HyWrxYAzm^N zHqc|*y*7PBY@d{u)9B}livgQKuA0jsV}DH%wQ$BG6LAYq@|!CwH`Lr73UoDFSOJTS zrr~HT9*)L4!b4+`g_T*iJ2)5~5BrD0(SCm@J~|NXU!JiFtPHb&WS7K>;pAJ#*IXYX znqs^bDc!Mh&2>gKMQpJsO;$Owk}=DZ{F35NjUnE7(#jjq_!!fSb3@b2VNudda8q-O z+nP!4SgiZs-q5Ec?Pg7aY0X^&KJIDm^FZ-XGs7dzW1c9UYG!$6QJY+J)|6CMD&{ov zlxm)vsTWNDW6;_&80n2KzjHM@ybdx=czMQ5vlJFvrFKw4iqt+z1E4EN>AP{R zGM%iIcXZ1y?V&r*Q^y(Sjvg15 z#L@S6_T9)h&JE0PK&Y2s{sp<2D?H=+PZU>XZzq%{%#73uh*V3u2#fl`5*3yyD^>oZ Stg@yg6j|4q(b`ZBsQv-|1|#bL delta 296 zcmXAj%Syvg5Qe{#sHZtOQE5u6uH3i~TCKgL-tYC6RuJ8|6jE1$2o-z+_mU^jH>iaQ zR>XxX_dbIwU!iz{4E)T@_y5EE`1hIcYw-FGR5(@)Q<9Vw78M7Vsw9xq6eBDqvXqeJ z6f2TdWq8S9jrFA4P;9c*2_JZW49g1^;;W#7Y4Mrsehf@TS(~>cl zHRNp0m|AR)vzn4=%LWyjapRnIIY-szyr~x?7i}(?-((Fg&qaSkBu6Zxk4X=9k_Jh(Mg+D-oLB#uvaUW ZW_sC%(C$91E%vi(*%x~6C+TW({sPvAYH9!g delta 536 zcmXAm%TE(g6ougZe`JS0o1|Q_*{?S4_vt zR58g$^B`zzja5egsY}s+mi0j-Cr2O`deATb|6~#?%Np36d za91*|xW|3P17;+VVC6_K9^`7_a5>i#jApwl;n<{PR`HNWQHR~tHpgSd6J`{1JXJj7 zxj^;@y-rf*>v^`rfPkSsHz9ph1JFn#%-o`&tOP28CS@qkh z7fI*`tJB%-U-1j+>}S^Xe4@E+Me8E#7g@WYU5lJ%nxtlz?%zTqTWMt*d0ol;-#{-r iwMwvxUHX%S?rEftje6Q*w{|T0^(463YobhdL+T&C{AVBl diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties index 08bbc8d..50acb60 100644 --- a/nbproject/private/private.properties +++ b/nbproject/private/private.properties @@ -1,2 +1,2 @@ compile.on.save=true -user.properties.file=C:\\Users\\Ma Jing\\AppData\\Roaming\\NetBeans\\8.1\\build.properties +user.properties.file=C:\\Users\\Work\\AppData\\Roaming\\NetBeans\\8.0.2\\build.properties diff --git a/src/random/text/generator/RandomTextGenerator.java b/src/random/text/generator/RandomTextGenerator.java index 7088860..d114201 100644 --- a/src/random/text/generator/RandomTextGenerator.java +++ b/src/random/text/generator/RandomTextGenerator.java @@ -10,7 +10,21 @@ * to form a new text. This technique is called the Markov chain. */ public abstract class RandomTextGenerator { - + static final String defaultText = "She is into superstitions, black cats and voodoo dolls. " + + "I feel a premonition that girl is gonna make me fall. " + + "She is into new sensations, new kicks in the candle light. " + + "She has got a new addiction for every day and night. " + + "She will make you take your clothes off and go dancing in the rain. " + + "She will make you live her crazy life but she will take away your pain like a bullet to your brain. " + + "Come On! Upside, inside out she is livin la vida loca. " + + "She will push and pull you down, livin la vida loca. " + + "Her lips are devil red and her skin is the color mocha. " + + "She will wear you out livin la vida loca. Come On! Livin la vida loca, Come on! " + + "She is livin la vida loca. Woke up in New York City in a funky cheap hotel. " + + "She took my heart and she took my money. She must have slipped me a sleeping pill. " + + "She never drinks the water and makes you order French Champagne. " + + "Once you have had a taste of her you will never be the same. " + + "Yeah, she will make you go insane."; public final String[] text; public final int SETSIZE = 3; diff --git a/src/random/text/generator/SpaceEfficientGenerator.java b/src/random/text/generator/SpaceEfficientGenerator.java index 6a41e3f..3ae39f8 100644 --- a/src/random/text/generator/SpaceEfficientGenerator.java +++ b/src/random/text/generator/SpaceEfficientGenerator.java @@ -34,21 +34,6 @@ public ArrayList getFollowingWords(WordSet set) { * @param args the command line arguments */ public static void main(String[] args) { - final String defaultText = "She is into superstitions, black cats and voodoo dolls. " - + "I feel a premonition that girl is gonna make me fall. " - + "She is into new sensations, new kicks in the candle light. " - + "She has got a new addiction for every day and night. " - + "She will make you take your clothes off and go dancing in the rain. " - + "She will make you live her crazy life but she will take away your pain like a bullet to your brain. " - + "Come On! Upside, inside out she is livin la vida loca. " - + "She will push and pull you down, livin la vida loca. " - + "Her lips are devil red and her skin is the color mocha. " - + "She will wear you out livin la vida loca. Come On! Livin la vida loca, Come on! " - + "She is livin la vida loca. Woke up in New York City in a funky cheap hotel. " - + "She took my heart and she took my money. She must have slipped me a sleeping pill. " - + "She never drinks the water and makes you order French Champagne. " - + "Once you have had a taste of her you will never be the same. " - + "Yeah, she will make you go insane."; SpaceEfficientGenerator gen = new SpaceEfficientGenerator(defaultText); System.out.println(gen.generateText(100)); } diff --git a/src/random/text/generator/SpeedEfficientGenerator.java b/src/random/text/generator/SpeedEfficientGenerator.java index 66e973c..bbf1076 100644 --- a/src/random/text/generator/SpeedEfficientGenerator.java +++ b/src/random/text/generator/SpeedEfficientGenerator.java @@ -52,21 +52,6 @@ public ArrayList getFollowingWords(WordSet set) { * @param args the command line arguments */ public static void main(String[] args) { - final String defaultText = "She is into superstitions, black cats and voodoo dolls. " - + "I feel a premonition that girl is gonna make me fall. " - + "She is into new sensations, new kicks in the candle light. " - + "She has got a new addiction for every day and night. " - + "She will make you take your clothes off and go dancing in the rain. " - + "She will make you live her crazy life but she will take away your pain like a bullet to your brain. " - + "Come On! Upside, inside out she is livin la vida loca. " - + "She will push and pull you down, livin la vida loca. " - + "Her lips are devil red and her skin is the color mocha. " - + "She will wear you out livin la vida loca. Come On! Livin la vida loca, Come on! " - + "She is livin la vida loca. Woke up in New York City in a funky cheap hotel. " - + "She took my heart and she took my money. She must have slipped me a sleeping pill. " - + "She never drinks the water and makes you order French Champagne. " - + "Once you have had a taste of her you will never be the same. " - + "Yeah, she will make you go insane."; SpeedEfficientGenerator gen = new SpeedEfficientGenerator(defaultText); // Uncomment the line below to print all the WordSets and their following words // gen.printWordMap(); From 164bc429fe1cae47772677294ce8c4d5c7c0df3b Mon Sep 17 00:00:00 2001 From: Yash Ugrankar Date: Sun, 30 Oct 2016 00:17:26 +0530 Subject: [PATCH 2/3] Added getDefaultText() --- .../text/generator/RandomTextGenerator.class | Bin 3410 -> 3486 bytes .../text/generator/RandomTextGenerator.java | 6 +++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/build/classes/random/text/generator/RandomTextGenerator.class b/build/classes/random/text/generator/RandomTextGenerator.class index e17e52e15366ed986d5ff0d3c8ade6bdb8be87a8..f0a56d4d9103784b96cbf027ad78ede8772cbab7 100644 GIT binary patch delta 1030 zcmY+C+iz4=6vltMbLQ-s!!B*7wBw;I(prU1XDBdOWDsfanE3MTb^Xp->pQ!F+TIh@8@@kAd9!uD3oqd}9G5R$F9x?hfuX%X%Ss2v3?or7bHgmv};x|3s z;-H1ME#x(aZ0>N3AzN6maKyr}4Zq_t(#)te-;FcIdojj6-e{?{RxP8%Usc1HGIW2MQ3owS+^pS(M%b>CT$38*LAZ0`@rr)qlLr8nJ|`8!Qb&m9WA0< zghrmC6~)uyRiLS{`-xp+_x>-Q!UO#agn08L7&Yec?&y`(=Vvg02J+(hfmW zwj-=&jd)6am1hN|RZSBWrQrJp_dBBM{v5HvS>ikA@Z?>zE0g+x=)5}=Vmh5UDhI_c zMeCed7U!aAKN?as&~RQYOw*sTUUkm(-CyYO-H@7FxOdr{v38uiU30e9h4IzyWXi6*#c`{uJSsv1CS9P$f_L2}> zDR)azB|0TZ%iHkkA>yV5$lqYD#}%=lBG-C%Ad~4{`dOv z1n@C80;*_<-6(W8c=OFz)-vu1vd+Qvq&;Otq9KO|%@AIR=&Ga76 zD2l_Tc=7Oyo1-~3Tjkrrq$a6Eb2xmK_oDEKp_;`CXYY|Eh73o;=T3e2uU_gL&$iHSUBn`oCYT zoRaFr!?}{s4_?(($!9psWFGTTBt^?(0fj7Nk;sL%y?6E+oUmcqzN}>`>S++H1vNqp zU)Z^F?=CU*U>w~!hQEEBxZFWYZOtQM6JAfmv_^Lv(`ofmcZ~dWER~2we9%!oq$Wpb zud!M|+Dmx<(46ohrr*T7$C_Fz7f!_|ylkl(QS^l3v`!^-L`hMpK!;6i!)I71OXx9X zrepUe@28xU6Os6vSrO$AnO!s|q9PSBH=^=^RPC}yUH%0Rv5xZ<~^~zX6QypQHc) diff --git a/src/random/text/generator/RandomTextGenerator.java b/src/random/text/generator/RandomTextGenerator.java index d114201..9efcfee 100644 --- a/src/random/text/generator/RandomTextGenerator.java +++ b/src/random/text/generator/RandomTextGenerator.java @@ -10,7 +10,7 @@ * to form a new text. This technique is called the Markov chain. */ public abstract class RandomTextGenerator { - static final String defaultText = "She is into superstitions, black cats and voodoo dolls. " + protected static final String defaultText = "She is into superstitions, black cats and voodoo dolls. " + "I feel a premonition that girl is gonna make me fall. " + "She is into new sensations, new kicks in the candle light. " + "She has got a new addiction for every day and night. " @@ -32,6 +32,10 @@ public RandomTextGenerator(String text) { this.text = text.split("\\s+"); } + public String getDefaultText(){ + return defaultText; + } + public String generateText(int wordAmount) { if (wordAmount <= SETSIZE) return null; From ae1039687a620820525ccebf125d353b397d0d67 Mon Sep 17 00:00:00 2001 From: Yash Ugrankar Date: Sun, 30 Oct 2016 11:58:43 +0530 Subject: [PATCH 3/3] Made getDefaultText() static --- .../text/generator/RandomTextGenerator.class | Bin 3486 -> 3468 bytes .../text/generator/RandomTextGenerator.java | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/build/classes/random/text/generator/RandomTextGenerator.class b/build/classes/random/text/generator/RandomTextGenerator.class index f0a56d4d9103784b96cbf027ad78ede8772cbab7..0fd006a1d7934d1a62302790a3f165a7a4ff2ff6 100644 GIT binary patch delta 53 zcmbOy-6OqW8n*@~gAs!<10#bj0|SFJkOl!}A@&VGijhGNNV0(iRW@JXKF0_E$x{av delta 71 zcmeB?o+rIw8n+cAgAs!<10#bj0|O8<0wDtfvk?0RAjQO>2PE0RLMjaUKsFCVn!$j< Mkbz