From 810e0c09130948c3a8cb9eddfe245516ab6b454d Mon Sep 17 00:00:00 2001 From: LToothbrush <137121223+LToothbrush@users.noreply.github.com> Date: Thu, 25 Apr 2024 01:21:29 -0500 Subject: [PATCH 1/4] Added stats to grid --- src/main/java/com/cse3310/App.java | 22 ++++++++++++++- src/main/java/com/cse3310/Game.java | 44 +++++++++++++++++++++-------- 2 files changed, 53 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/cse3310/App.java b/src/main/java/com/cse3310/App.java index fb076a0..46ace9e 100644 --- a/src/main/java/com/cse3310/App.java +++ b/src/main/java/com/cse3310/App.java @@ -151,6 +151,26 @@ public void onStart() { public static void main(String[] args) { + String filename = "words.txt"; + //Read in file of words + ArrayList wordList = new ArrayList<>(); + try(BufferedReader br = new BufferedReader(new FileReader(filename))) + { + String line; + while((line = br.readLine()) != null) + { + wordList.add(line.trim()); + } + + } + catch (IOException e) + { + System.err.println("Error reading file:"+ e.getMessage()); + } + + Game G = new Game(wordList); + + /* // Set up the http server try { String envPort = System.getenv("HTTP_PORT"); @@ -176,7 +196,7 @@ public static void main(String[] args) { } catch (NullPointerException e) { // Checks for environment variable e.printStackTrace(); } - + */ } } diff --git a/src/main/java/com/cse3310/Game.java b/src/main/java/com/cse3310/Game.java index 4d94bf1..5ca752a 100644 --- a/src/main/java/com/cse3310/Game.java +++ b/src/main/java/com/cse3310/Game.java @@ -35,21 +35,19 @@ public char[][] generateGrid(ArrayList words,ArrayList wordbank) Random rand = new Random(); int length = 20; int width = 20; - int areaPortion = 5; char[][] grid = new char[width][length]; String alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; String insertWord; int orientation; //Integer to determine what direction the word will be printed - int startY; - int startX; - int dX; - int dY; + int startY, startX, dX, dY; int tries; boolean fits; int validWordsLetters = 0; // For calculating word density int[][] directions = {{1,1} , {-1,1} , {0,1} ,{-1,0}, {1,0}}; double density = .67; // density of grid int maxLength = 10; + float diagUp,diagDown,horizontals,vertUp,vertDown; // stats to see orientations + diagUp = diagDown = horizontals = vertUp = vertDown = 0; //Input words into the array //Take random words from the word list to put inside a word bank int index = 0; @@ -69,7 +67,7 @@ public char[][] generateGrid(ArrayList words,ArrayList wordbank) fits = true; startX = rand.nextInt(length); startY = rand.nextInt(width); - orientation = rand.nextInt(4); + orientation = rand.nextInt(5); dX = directions[orientation][1]; dY = directions[orientation][0]; int secondCheck = 0; @@ -113,6 +111,21 @@ public char[][] generateGrid(ArrayList words,ArrayList wordbank) int y = startY + (c * dY); //System.out.println("Putting letter " + insertWord.charAt(c) + " of word " + insertWord + " at index " + y + " " + x); } + switch(orientation) + { + case 0: diagUp++; + break; + case 1: diagDown++; + break; + case 2: horizontals++; + break; + case 3: vertDown++; + break; + case 4: vertUp++; + break; + default: System.out.println("Error"); + break; + } System.out.println(index + "." + wordBank.get(index)); validWordsLetters = validWordsLetters + wordBank.get(index).length(); index++; @@ -121,7 +134,13 @@ public char[][] generateGrid(ArrayList words,ArrayList wordbank) } - System.out.println(" Actual Density: " + (double)validWordsLetters / (length * width)); + System.out.println("Index: " + index); + System.out.println("Actual Density: " + (double)validWordsLetters / (length * width)); + System.out.println("Upward Diagonals: " + (diagUp/index)); + System.out.println("Downward Diagonals: " + (diagDown/index)); + System.out.println("Horizontals: " + (horizontals/index)); + System.out.println("Downward verticals: " + (vertDown/index)); + System.out.println("Upward verticals:" + (vertUp/index)); //Fill in rest of the grid with random letters //Print grid for(int i = 0;i < width; i++) @@ -132,13 +151,14 @@ public char[][] generateGrid(ArrayList words,ArrayList wordbank) { grid[i][j] = alphabet.charAt(rand.nextInt(alphabet.length())); + System.out.printf(" |"); + } - + else + { System.out.printf("" + grid[i][j] + "|"); - - - - + } + } System.out.println(); } From a2f5202500fd26e2d4b3e47a8e9601f66746d481 Mon Sep 17 00:00:00 2001 From: unknown <137121223+LToothbrush@users.noreply.github.com> Date: Thu, 25 Apr 2024 18:39:42 -0500 Subject: [PATCH 2/4] Made grid stats more accurate --- src/main/java/com/cse3310/Game.java | 46 ++++++++++-------- target/classes/com/cse3310/App.class | Bin 0 -> 6412 bytes target/classes/com/cse3310/Coordinate.class | Bin 0 -> 510 bytes target/classes/com/cse3310/Game.class | Bin 0 -> 5300 bytes target/classes/com/cse3310/HttpServer$1.class | Bin 0 -> 1652 bytes target/classes/com/cse3310/HttpServer.class | Bin 0 -> 2389 bytes target/classes/com/cse3310/Lobby.class | Bin 0 -> 463 bytes target/classes/com/cse3310/Locations.class | Bin 0 -> 825 bytes target/classes/com/cse3310/ServerEvent.class | Bin 0 -> 341 bytes target/classes/com/cse3310/User.class | Bin 0 -> 632 bytes target/classes/com/cse3310/UserEvent.class | Bin 0 -> 557 bytes target/test-classes/com/cse3310/AppTest.class | Bin 0 -> 469 bytes 12 files changed, 25 insertions(+), 21 deletions(-) create mode 100644 target/classes/com/cse3310/App.class create mode 100644 target/classes/com/cse3310/Coordinate.class create mode 100644 target/classes/com/cse3310/Game.class create mode 100644 target/classes/com/cse3310/HttpServer$1.class create mode 100644 target/classes/com/cse3310/HttpServer.class create mode 100644 target/classes/com/cse3310/Lobby.class create mode 100644 target/classes/com/cse3310/Locations.class create mode 100644 target/classes/com/cse3310/ServerEvent.class create mode 100644 target/classes/com/cse3310/User.class create mode 100644 target/classes/com/cse3310/UserEvent.class create mode 100644 target/test-classes/com/cse3310/AppTest.class diff --git a/src/main/java/com/cse3310/Game.java b/src/main/java/com/cse3310/Game.java index 5ca752a..14eddef 100644 --- a/src/main/java/com/cse3310/Game.java +++ b/src/main/java/com/cse3310/Game.java @@ -39,7 +39,7 @@ public char[][] generateGrid(ArrayList words,ArrayList wordbank) String alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; String insertWord; int orientation; //Integer to determine what direction the word will be printed - int startY, startX, dX, dY; + int startY, startX, dX, dY,finalY,finalX; int tries; boolean fits; int validWordsLetters = 0; // For calculating word density @@ -51,9 +51,10 @@ public char[][] generateGrid(ArrayList words,ArrayList wordbank) //Input words into the array //Take random words from the word list to put inside a word bank int index = 0; + int overlap = 0; while(((double)validWordsLetters / (length * width)) < density) { - + //Grab a word and add it to a word length String word = words.get(rand.nextInt(words.size())).toUpperCase(); while(word.length() > maxLength){ word = words.get(rand.nextInt(words.size())).toUpperCase(); @@ -95,6 +96,7 @@ public char[][] generateGrid(ArrayList words,ArrayList wordbank) } } } + }while(fits == false && tries < 100); if(tries >= 100) { @@ -107,34 +109,36 @@ public char[][] generateGrid(ArrayList words,ArrayList wordbank) for(int c = 0; c < insertWord.length() ; c++) { grid[startY + (c * dY)][startX + (c * dX)] = insertWord.charAt(c); - int x = startX + (c * dX); - int y = startY + (c * dY); + finalX = startX + (c * dX); + finalY = startY + (c * dY); //System.out.println("Putting letter " + insertWord.charAt(c) + " of word " + insertWord + " at index " + y + " " + x); } - switch(orientation) + + if(dY == 0) + { + horizontals++; + } + else if(dY == 1) { - case 0: diagUp++; - break; - case 1: diagDown++; - break; - case 2: horizontals++; - break; - case 3: vertDown++; - break; - case 4: vertUp++; - break; - default: System.out.println("Error"); - break; + if(dX == 1) + diagUp++; + else + vertUp++; + } + else if(dY == -1) + { + if(dX == 1) + diagDown++; + else + vertDown++; } System.out.println(index + "." + wordBank.get(index)); validWordsLetters = validWordsLetters + wordBank.get(index).length(); index++; } - - - + } - System.out.println("Index: " + index); + System.out.println("Actual Density: " + (double)validWordsLetters / (length * width)); System.out.println("Upward Diagonals: " + (diagUp/index)); System.out.println("Downward Diagonals: " + (diagDown/index)); diff --git a/target/classes/com/cse3310/App.class b/target/classes/com/cse3310/App.class new file mode 100644 index 0000000000000000000000000000000000000000..d34038053b703f253368272c6bc48f83c74294f3 GIT binary patch literal 6412 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 LVJ0P&sagL8!AD0V literal 0 HcmV?d00001 diff --git a/target/classes/com/cse3310/Coordinate.class b/target/classes/com/cse3310/Coordinate.class new file mode 100644 index 0000000000000000000000000000000000000000..577f122851ce02138f3830cc39fb367aa906a456 GIT binary patch literal 510 zcmZutO-sW-6r4@cub6%qYpu429@_{;sW-(-K_~=!PzuFUnl5!qnuRpgzolRiMEn8% zDDiC?=tUNG-^{*wGrK>(pWgs3(Jnw^XasWU1}on0U!1!GDdU-l{Dc=^Fw_?Qv+ss} zGf@w@eM%Hs!r8gd5PlYt+O{a7fRkw)?)Rt!z=|D;z8_ecqg zAx%q!j2JY9&3n0y1AZ%%RdpvgQ_n<)lIip@8l4oBDyCv)Oc5%%NoYbHs;}yNV9#l7 zP;uHD)ZWrYn|2!p?eu~4{t~SU$qtC=Y-On9kPr<>ZCF|QT}eF}TTSL+6Kdj^CNi9)n${m$!cs^8 literal 0 HcmV?d00001 diff --git a/target/classes/com/cse3310/Game.class b/target/classes/com/cse3310/Game.class new file mode 100644 index 0000000000000000000000000000000000000000..d3d2ab88877a9ad979fc187bdcc3d000c56a5a40 GIT binary patch literal 5300 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 literal 0 HcmV?d00001 diff --git a/target/classes/com/cse3310/HttpServer.class b/target/classes/com/cse3310/HttpServer.class new file mode 100644 index 0000000000000000000000000000000000000000..0c7e3209d75437ff8b708e143d3e5f1a416686a6 GIT binary patch literal 2389 zcmb7GYgZFj6y29ZC&WQCC|Xb(6>12N5wW&{wN;cy8;}Z31?^)=7!HNtF#0B=U*KGJ(aiJicFwcVE2HvtV%BJ%6>p|F)3gaoxrn8lB*XS&ruf{L}qfU!=60NM*X5p zB8L4YT96WmWqR_>5IA7M#O`LaD+(ORO!jQqTt9L|TbweHL61N}`88sRHM7-(dwbDupiiJJLePlK#DEUWC~LT` zrx`nKB8fc$tvSb&)0NVq4Cd@bmuX1l{DSS~?ZDCB^~tzec0z%}x$X7AbQ_unI;v%K zI?CuS=08vgoF^%c7qM2{pev)6S3buD$+9Zp~UNCT3 z;OJ(9X5f9y68K6H_LpaZO+^UFV%ZRcv>{52>oF+oe6X zgJZfjxnUyT#;k$s0@nXDH8F>GSUe#iyRLt4TzWFFl`KwrMY*aGEcE0Pc$Z~o8JHJ1 zx03^OPFToFuBr*!E4ngB;s$PNR&ELGuVbd%^v02%yn*){%P(pN8r6p;Y%B^S?P9U+ zQQ+1#r0s~a#+XKKZmA;1k^oiHY}sYUQcg)4xJ?CbFW|1hBqWwKEJvU-^ItlzY2dDj zSCC48VoyJlOWFz3uETEQ=@#L8wa%cMl5e6MwI3Oc~&!&pKg8r9NwnY-EN_r>1X#?wt_Kx{NPJx*pug_67}8VeBLI zF54I#-L}jsyKr~PF4tR2a@MZ|1*!GJf_--94CpFncbN33<5AZRLm3+QR^ZG|bla#8 z(((L6YOAsZ_G~Ie9A}%1@otRq?%0Lh{4)5}gak+SPL9yG4#y_0wO}vDR(^ekcx2a` zUBkX?D)9tuk8yAvo%5-qYk0A-n!p$M8Y@Jm85ky!nui3A z5dTqLg2!-*xQCdK^EiQvIEfjS%p&@58~wB$zynzLiPoB-v&2lqb%qY$E>>}$rwk#7 zkMRi^I*&1Y$~47j*N)HWLEuZ;v?KNxP8k^f2MZ7eXF062)8Z?xHZjHre4Zeql285n Wh8Mzj{NHhd&+pO9E;o)J(EKkf0cj=x literal 0 HcmV?d00001 diff --git a/target/classes/com/cse3310/Lobby.class b/target/classes/com/cse3310/Lobby.class new file mode 100644 index 0000000000000000000000000000000000000000..f666934d9e796670103a1afc00200f29e5dd513d GIT binary patch literal 463 zcmZ8d%TB^j5IxhD7HSnJif@fOz{F~BhjC-#s?kK0g}d8w10~QVrI_$pCK3}Det;ik zoLfy4H#2kQapuf?e7?N{ILDy{jZh7fi5E^~yM1=*`AHDWEf|E#NIVH|EaHK88;oR_ z5scYXrUcjjEp@XriU%D+A(f&(C(t9oyoll`yCiHh{J-Q6Jl<*cnCL3$OB*^?9h9&} z&>PKO2^F{&s=WIDkb@dbLQ(CH#YC3C+ztvbRkZ2ALXlARqgdX|CV@=vMKG31X%dQY zPo$B;KS?7SMpHsH7(r*p-PCVmC|;RiVdrYGYW%@T{)BfE|4ma zx~N$9M^!y`EC>p1H`kt{GvB@U*uQ@N_zB<*8V(AAr64}_gTCI`dA04g;y_swM|}q+ z!Q6@ZruZ@R(l{p61g#LTgKc?6el-s5kDLY8C;O)3$cPM4p zwoOdbYaX>mhuDwfq-#jf%{}5KcTHsMo}gH7912SNaaX%2qT-V#}MpRN%es>Gz{TrAmR(-$n?YIVIY`%Lw;ZCjOa%UXSW#>UZyG8mVK2~4_J#;SuA zL3Jzv5BG4N(-J3GA0-V#Y&J&Vx#ZxXVD+ytxOj{w4%Rr?-9dSHif4ifd)}nStm>Rv zAl!R?q-mZyqow~K>I&R;JV*ll&ZP0pT&MCfT@GtpyU0I=pmcXuho=IjGL_$e$}|-} za{v>Ym+;Or%M5FJfg)yEz5IO+Rh~E%7Fg5E2Lu-QtZshC;?@OfS9nl-eSt@36brZk gl`~LnXvPr4Yj}UN@l8flTXQt z(n`R8HT8`pfxTJ(b*OsocX8a5;*CIlBKx-DgbCD10N$Zu&PF>&Ds_)*3? zLj@z5Wad84Irq-j_s1uI3mj>PG2|S7Y&jENub-b;_Y)pyh*NZEKik&G_6F8%Z^)gH zAvvX_XOB5UzO_ns!oc+gmkj#M5Bg1i>QODbVbBIt``~*F>XqxcVS}MmS#PX%8RAX9 z&kZQZm@trKP%71~4u%aA38=y_2pBty34db~Xy_jqt;_eN5d@7SZR9k{}e zg7NUloe0VQ=OoG6gokZ8QOe^pG5lgaZSWf}R;ufg8H|oU4IF;$3R+z>o{Ej&nDi;M zT!mf|P8N|MDPIyDWelV!Zj$$i7#*Nkdq=ud}!# zhE4%lY|5PM#}>B9BP7X7KY*PjOCw@YCBq8WklY38DE+}wmsl!xX$FC{hy6&gC4C@K adqeJp2p1AX8AyVVWJ)^`!7v=is>2_XBWAz= literal 0 HcmV?d00001 diff --git a/target/classes/com/cse3310/UserEvent.class b/target/classes/com/cse3310/UserEvent.class new file mode 100644 index 0000000000000000000000000000000000000000..bdb22eebffd0a5bb880a5079964136f0dd58ba03 GIT binary patch literal 557 zcmZutO;5r=6r6=33KbCfP|<@oY@%rJrtxCbkf0t=?n~W3Nhz@{{x1*2#DhP;A7z|Z zi5&E>Z)P_$^WNLfulElCr`XFPrBHRJla?EqcKhVG^%$A(>cs?c7M4P3tY37?*TJxL zKNuS~R>+3td1fLq)lpcv(G$~oA`zpIa(C(J#i17r&lK|RNXNG(iuBM>d+r5Ze4&tT z9`qHg%juKJA&sJqJZyzx*9*+uY%(z6gC6*Fl)F<``+XgHa$h`J@yLr5>fL|mXV-eO z)A>8iL4OSjH5(bM2-~ue{b4&cRrH2&Ypy+MUHJWxBUudlw50ia77r6xA^rsE zPB52Xic0Roy3W@&Q4urF8w#%^DU?`qM5z{q8)PDv;4(Ie5>R240G~=}T9E*!F-O(e zoulp?&au7BtI-P-s4Q}b64?fm%1O5K<6mSmDOo`JRgx8Cl8Sr*7gT8Qmcs5gXBAtZ literal 0 HcmV?d00001 diff --git a/target/test-classes/com/cse3310/AppTest.class b/target/test-classes/com/cse3310/AppTest.class new file mode 100644 index 0000000000000000000000000000000000000000..e72f86da8d288c9d99baf7325007b6fceaa8b2e9 GIT binary patch literal 469 zcmZvY%}&BV6ot=}LbX<@{HQG5p$n_Q9mb?Fan)#|1QT~dnZS@TLpoD^E>{{CK7bEp zyaf_AZ0?;i=jNL^_xJDn2f#Ht9vp^ds^?K^M6Y*s8O4jmKp5-6We8{djYk<*ljw0Y z6RBmW-AE^mYM1z8^_ALi~L2}=^!r%)p;tEm2)waMiMJlN?UHFR)h)@oll}!LBEU2 z0DT_~v^+G)+BmT>BDVqBIAZYmQmxo-_q7bieV^4#;&-Ur&Y9OHhxTCCL54;RfW>C@74J M=2qA-xeiYL0TLWs!T Date: Mon, 29 Apr 2024 18:03:44 -0500 Subject: [PATCH 3/4] merge fix --- src/main/java/com/cse3310/Game.java | 29 ++++++++---------- .../classes/com/cse3310/App$LetterTimer.class | Bin 0 -> 2554 bytes target/classes/com/cse3310/App.class | Bin 6412 -> 11899 bytes target/classes/com/cse3310/Coordinate.class | Bin 510 -> 0 bytes target/classes/com/cse3310/Error.class | Bin 0 -> 420 bytes target/classes/com/cse3310/Game.class | Bin 5300 -> 6579 bytes target/classes/com/cse3310/Lobby.class | Bin 463 -> 463 bytes target/classes/com/cse3310/Locations.class | Bin 825 -> 0 bytes target/classes/com/cse3310/ServerEvent.class | Bin 341 -> 592 bytes target/classes/com/cse3310/User.class | Bin 632 -> 855 bytes target/classes/com/cse3310/UserEvent.class | Bin 557 -> 839 bytes target/classes/com/cse3310/timerEvent.class | Bin 0 -> 305 bytes .../compile/default-compile/createdFiles.lst | 0 .../compile/default-compile/inputFiles.lst | 9 ++++++ words.txt | 2 +- 15 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 target/classes/com/cse3310/App$LetterTimer.class delete mode 100644 target/classes/com/cse3310/Coordinate.class create mode 100644 target/classes/com/cse3310/Error.class delete mode 100644 target/classes/com/cse3310/Locations.class create mode 100644 target/classes/com/cse3310/timerEvent.class create mode 100644 target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst create mode 100644 target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst diff --git a/src/main/java/com/cse3310/Game.java b/src/main/java/com/cse3310/Game.java index 04b352a..00ea38f 100644 --- a/src/main/java/com/cse3310/Game.java +++ b/src/main/java/com/cse3310/Game.java @@ -5,7 +5,8 @@ import java.util.Collections; import java.time.Clock; -public class Game { +public class Game +{ public int GameId; public char[][] grid; @@ -28,7 +29,8 @@ public Game(ArrayList words, int GameId) { this.grid = generateGrid(words, wordBank); } - public int isEnd(int id) { + public int isEnd(int id) + { for (int endId : endIds) { if (id == endId) { return 0; @@ -110,9 +112,9 @@ public char[][] generateGrid(ArrayList words, ArrayList wordbank // Input words into the array // Take random words from the word list to put inside a word bank int index = 0; - int overlap = 0; - while (((double) validWordsLetters / (length * width)) < density) { -//Grab a word and add it to a word length + while (((double) validWordsLetters / (length * width)) < density) + { + //Grab a word and add it to a word length String word = words.get(rand.nextInt(words.size())).toUpperCase(); while (word.length() > maxLength) { word = words.get(rand.nextInt(words.size())).toUpperCase(); @@ -152,7 +154,9 @@ public char[][] generateGrid(ArrayList words, ArrayList wordbank } } while (fits == false && tries < 100); - if (tries >= 100) { + + if (tries >= 100) + { fits = false; wordBank.remove(index); } @@ -205,17 +209,6 @@ else if(dY == -1) System.out.println("Horizontals: " + (horizontals/index)); System.out.println("Downward verticals: " + (vertDown/index)); System.out.println("Upward verticals:" + (vertUp/index)); - //Fill in rest of the grid with random letters - //Print grid - for(int i = 0;i < width; i++) - { - for(int j = 0; j < length; j++) - { - if(grid[i][j] == 0) - { - - - } System.out.println(" Actual Density: " + (double) validWordsLetters / (length * width)); // Fill in rest of the grid with random letters // Print grid @@ -242,6 +235,7 @@ else if(dY == -1) } + public void checkWin(User user) { } @@ -254,3 +248,4 @@ public void Tick() { } } + diff --git a/target/classes/com/cse3310/App$LetterTimer.class b/target/classes/com/cse3310/App$LetterTimer.class new file mode 100644 index 0000000000000000000000000000000000000000..5766f9b80089cd15e9e87f0d286171edfde87d45 GIT binary patch literal 2554 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 GqW=LsRQTrr literal 6412 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 LVJ0P&sagL8!AD0V diff --git a/target/classes/com/cse3310/Coordinate.class b/target/classes/com/cse3310/Coordinate.class deleted file mode 100644 index 577f122851ce02138f3830cc39fb367aa906a456..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 510 zcmZutO-sW-6r4@cub6%qYpu429@_{;sW-(-K_~=!PzuFUnl5!qnuRpgzolRiMEn8% zDDiC?=tUNG-^{*wGrK>(pWgs3(Jnw^XasWU1}on0U!1!GDdU-l{Dc=^Fw_?Qv+ss} zGf@w@eM%Hs!r8gd5PlYt+O{a7fRkw)?)Rt!z=|D;z8_ecqg zAx%q!j2JY9&3n0y1AZ%%RdpvgQ_n<)lIip@8l4oBDyCv)Oc5%%NoYbHs;}yNV9#l7 zP;uHD)ZWrYn|2!p?eu~4{t~SU$qtC=Y-On9kPr<>ZCF|QT}eF}TTSL+6Kdj^CNi9)n${m$!cs^8 diff --git a/target/classes/com/cse3310/Error.class b/target/classes/com/cse3310/Error.class new file mode 100644 index 0000000000000000000000000000000000000000..48d35367f04cbecbba957417350baa13c6bd66f9 GIT binary patch literal 420 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 delta 25 gcmX@le4cs397bL?1{MZ(1|9|u20;eS$txMv07>iwp#T5? diff --git a/target/classes/com/cse3310/Locations.class b/target/classes/com/cse3310/Locations.class deleted file mode 100644 index 95a26e17db99c9c9f2dd954db1c76858480a1158..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 825 zcmaiyOHbQC6ot=C0w%@*!XrSR^aTk>H7(r*p-PCVmC|;RiVdrYGYW%@T{)BfE|4ma zx~N$9M^!y`EC>p1H`kt{GvB@U*uQ@N_zB<*8V(AAr64}_gTCI`dA04g;y_swM|}q+ z!Q6@ZruZ@R(l{p61g#LTgKc?6el-s5kDLY8C;O)3$cPM4p zwoOdbYaX>mhuDwfq-#jf%{}5KcTHsMo}gH7912SNaaX%2qT-V#}MpRN%es>Gz{TrAmR(-$n?YIVIY`%Lw;ZCjOa%UXSW#>UZyG8mVK2~4_J#;SuA zL3Jzv5BG4N(-J3GA0-V#Y&J&Vx#ZxXVD+ytxOj{w4%Rr?-9dSHif4ifd)}nStm>Rv zAl!R?q-mZyqow~K>I&R;JV*ll&ZP0pT&MCfT@GtpyU0I=pmcXuho=IjGL_$e$}|-} za{v>Ym+;Or%M5FJfg)yEz5IO+Rh~E%7Fg5E2Lu-QtZshC;?@OfS9nl-eSt@36brZk gl`~LnXvPr4Yj}Q0{HrU=dnfS`vPi2V&yEAK;HN z&K6BDaM;P4H}mFezrH^{0bJrhgTheq!ja{Td82W0ZgshsaB)51L8L)tC=8s5V-204 zZ{4{A?nMlm;IAnq6SY1tKt5@M8*O5ZOKo*+}scNm40mGJoHKZll zF`!|cA#eKuzl}#O7x#`kq_Isq^qgVO5x(?)Ni}-%Y3K641s3i{OBDa>rZ0b5y&J~D z<2SynURV&F$phkurb*EkDfDPKvXG+@n<1n?C&XwCgYcZ$K#n5M@v{tu?8 BeV70M delta 189 zcmcb>a+Qhe)W2Q(7#J8#7(^y=nR>EC=9fAar7|)I`6TD(>L(Yc8XFrL=!X`k7Fjbg zu(>DZrh29@GBA1qIX0PjnI(3N49psuVT=qc&iN^+Tnx+%ygUq?3|y1t7=0!;GipXK zGO#kR0WDx)U}xX}l0eNMc_7IRfBol)$08QK)#sB~S diff --git a/target/classes/com/cse3310/User.class b/target/classes/com/cse3310/User.class index ff3a6d6b87f1f838494c7460456e2463b0967bb7..1876a31cc6928f33760becd82dae2e3b54303df6 100644 GIT binary patch literal 855 zcmaJ;O>fgc6r6QFoTMgc)1|KzdvCY6beB5yDK z5570`zpy-+bJ0|zQ4 zRSMNqB?84z#iTj|l}tP>_jVzJRE6(l=3U5OXb@$~FDY|2CU_pjQFbEG?_O{Jf0f>d z{Z7?b)=G+Dg}|1B63QBFJ8*DAqgxJaR5ZHnpqitOgIbRE9n?_~XbhrQ zp3i52OkVrJ)GS7Y{&eIgk_>ZSd?X-;RSGCMarZU18`?Rzbj3;kR2&D)dT z^{sC2`WggkLp4uA`6AMGs`}w0yE#P{)FW#xpqMXqdYTy?9N+a12$HL6>A)gRR| l9vW4FE_y31k5Tt2xnI!!M35WLn|F+ilNYRH1YA>f^b1iVmWKcU delta 377 zcmYk0%}T>S6ot=il4&zee{7m+{a?1zMKX-M?jvKd`js0ZYPvFfoS-tQN2}tQV0Z3kN*?jK(87{$@0u R;0z{{va?rU2pjg-<_|7ZC?o&? diff --git a/target/classes/com/cse3310/UserEvent.class b/target/classes/com/cse3310/UserEvent.class index bdb22eebffd0a5bb880a5079964136f0dd58ba03..3355c9612b6c9bf0ba39d6cd1a8349554b13dd2c 100644 GIT binary patch literal 839 zcmZva+iuf95QhIvoP$%7hLAM0DTkIrQ%ev~xNB4i5THngUIfzXwX*D80eC3HtYf7?;==RKuIK-DcI@AOe*OaR3WFL-4BbF3hCwPuqn9s+Us9poU5P~3 zU@^2V`4u0=JPC(q{-p>sLrsZqnMf&P6Nc&sz7Uf+CB|ryws+&1Y855n3By)!!SzRx zraTl3l|aT)G1Nmcr{^+Zu=CWDhFkYDtz}|h4Nv<1wLzzAa;BqrIHO*qBC3c*bD8m2=TR8G8m2NhIJ_Q*kPl|6A#hfVXG%1i~~ePoVqu8GghC&K|* z%Jg3}=ph0{7=Nzh&b3kKR-sPu{#K#QLbuT(+HLZb(583?o%Om)d(6y(;$3<-B4wl% z_Xl>r=axRj29+73g)a6fb5=#Thx@cLfCm%}Af`%-v||8ne~E|g{t}1ovn3wi@OJ1@ qphGS4*w{rAdqnT&YAU+#aU9= z%nZA4-@dG?bl%^`6TlSV#W{AYS+t7|a{+TOTnfm=ezkUBqTnJ2H$I6?&3BQ3m4!gV zg`KWe{1GD|n+a diff --git a/target/classes/com/cse3310/timerEvent.class b/target/classes/com/cse3310/timerEvent.class new file mode 100644 index 0000000000000000000000000000000000000000..ce8947c7a51cdaa413fc9032a3972957140933be GIT binary patch literal 305 zcmZvXF;BxV5QX10At`Af&;hZs0Rsk=t*8SCB&4Vepze;bz*S;Psnh?(gv7uP;76fe z3=#{2&-dOvoxc0}{`drNiE)Yn;Xt`YsFj{fF3yEFjc#w(+WHhRVQ(qdQqGnxhwI+;9r)0g5 zt?Biz8T(hWA{>_g^GpfZqw89w?@Yg=_(MJGDRBfQ;Jb+57Lw3WPr%MLE5U!5oxUS` ZV`G4vYZA-|JKX0#0qmk+#pj3A{ssrxKCS=& literal 0 HcmV?d00001 diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..e69de29 diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..27762ea --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,9 @@ +/mnt/c/Users/gotno/Documents/CSE3310/utaProject/cse3310_sp24_group_26/src/main/java/com/cse3310/Game.java +/mnt/c/Users/gotno/Documents/CSE3310/utaProject/cse3310_sp24_group_26/src/main/java/com/cse3310/HttpServer.java +/mnt/c/Users/gotno/Documents/CSE3310/utaProject/cse3310_sp24_group_26/src/main/java/com/cse3310/UserEvent.java +/mnt/c/Users/gotno/Documents/CSE3310/utaProject/cse3310_sp24_group_26/src/main/java/com/cse3310/App.java +/mnt/c/Users/gotno/Documents/CSE3310/utaProject/cse3310_sp24_group_26/src/main/java/com/cse3310/User.java +/mnt/c/Users/gotno/Documents/CSE3310/utaProject/cse3310_sp24_group_26/src/main/java/com/cse3310/Error.java +/mnt/c/Users/gotno/Documents/CSE3310/utaProject/cse3310_sp24_group_26/src/main/java/com/cse3310/Lobby.java +/mnt/c/Users/gotno/Documents/CSE3310/utaProject/cse3310_sp24_group_26/src/main/java/com/cse3310/ServerEvent.java +/mnt/c/Users/gotno/Documents/CSE3310/utaProject/cse3310_sp24_group_26/src/main/java/com/cse3310/timerEvent.java diff --git a/words.txt b/words.txt index 8a72d81..b87e7ca 100644 --- a/words.txt +++ b/words.txt @@ -205,7 +205,7 @@ agrees agricultural agriculture ahead -aids +aid aimed aims aircraft From 435f2938e48df49702e8eef6b560cf4fe7c34a25 Mon Sep 17 00:00:00 2001 From: unknown <137121223+LToothbrush@users.noreply.github.com> Date: Tue, 30 Apr 2024 19:42:12 -0500 Subject: [PATCH 4/4] minor fix to printing of grid in console --- src/main/java/com/cse3310/Game.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/cse3310/Game.java b/src/main/java/com/cse3310/Game.java index a587d8d..f2de005 100644 --- a/src/main/java/com/cse3310/Game.java +++ b/src/main/java/com/cse3310/Game.java @@ -209,21 +209,20 @@ else if(dY == -1) System.out.println("Horizontals: " + (horizontals/index)); System.out.println("Downward verticals: " + (vertDown/index)); System.out.println("Upward verticals:" + (vertUp/index)); - System.out.println(" Actual Density: " + (double) validWordsLetters / (length * width)); + // Fill in rest of the grid with random letters - // Print grid + // Print grid to console for debugging for (int i = 0; i < width; i++) { for (int j = 0; j < length; j++) { - if (grid[i][j] == 0) { + if (grid[i][j] == 0) + { grid[i][j] = alphabet.charAt(rand.nextInt(alphabet.length())); - System.out.printf(" |"); - } - else - { + + System.out.printf("" + grid[i][j] + "|"); - } + } System.out.println();