Merge pull request #53 from utastudents/luke

Stats for grid making in terminal
utastudents · May 1, 2024 · cca761f · cca761f
2 parents 0c3edfb + 435f293
commit cca761f
Show file tree

Hide file tree

Showing 28 changed files with 8,280 additions and 8,410 deletions.
diff --git a/src/main/java/com/cse3310/Game.java b/src/main/java/com/cse3310/Game.java
@@ -3,7 +3,8 @@
 import java.util.ArrayList;
 import java.util.Random;
 
-public class Game {
+public class Game
+{ 
 
     public int GameId;
     public char[][] grid;
@@ -28,7 +29,8 @@ public Game(ArrayList<String> 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;
@@ -105,11 +107,14 @@ public char[][] generateGrid(ArrayList<String> words, ArrayList<String> wordbank
         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;
-        while (((double) validWordsLetters / (length * width)) < density) {
-
+        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();
@@ -122,7 +127,7 @@ public char[][] generateGrid(ArrayList<String> words, ArrayList<String> 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;
@@ -147,8 +152,11 @@ public char[][] generateGrid(ArrayList<String> words, ArrayList<String> wordbank
                         }
                     }
                 }
+
             } while (fits == false && tries < 100);
-            if (tries >= 100) {
+
+            if (tries >= 100)
+            {
                 fits = false;
                 wordBank.remove(index);
             }
@@ -169,24 +177,53 @@ public char[][] generateGrid(ArrayList<String> words, ArrayList<String> wordbank
 
                 System.out.println("Start: " + startId + "\n" + "End: " + endId);
 
+
+                if(dY == 0)
+                {
+                    horizontals++;
+                }
+                else if(dY == 1)
+                {
+                    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(" Actual Density: " + (double) validWordsLetters / (length * width));
+
+        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
+        // 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("" + grid[i][j] + "|");
-
+
+
+                    System.out.printf("" + grid[i][j] + "|");
+
+
             }
             System.out.println();
         }
@@ -197,6 +234,7 @@ public char[][] generateGrid(ArrayList<String> words, ArrayList<String> wordbank
 
     }
 
+
     public void checkWin(User user) {
 
     }
@@ -209,3 +247,4 @@ public void Tick() {
 
     }
 }
+
diff --git a/target/classes/com/cse3310/App$LetterTimer.class b/target/classes/com/cse3310/App$LetterTimer.class
diff --git a/target/classes/com/cse3310/App.class b/target/classes/com/cse3310/App.class
diff --git a/target/classes/com/cse3310/Error.class b/target/classes/com/cse3310/Error.class
diff --git a/target/classes/com/cse3310/Game.class b/target/classes/com/cse3310/Game.class
diff --git a/target/classes/com/cse3310/HttpServer$1.class b/target/classes/com/cse3310/HttpServer$1.class
diff --git a/target/classes/com/cse3310/HttpServer.class b/target/classes/com/cse3310/HttpServer.class
diff --git a/target/classes/com/cse3310/Lobby.class b/target/classes/com/cse3310/Lobby.class
diff --git a/target/classes/com/cse3310/PlayerList.class b/target/classes/com/cse3310/PlayerList.class
diff --git a/target/classes/com/cse3310/ServerEvent.class b/target/classes/com/cse3310/ServerEvent.class
diff --git a/target/classes/com/cse3310/User.class b/target/classes/com/cse3310/User.class
diff --git a/target/classes/com/cse3310/UserEvent.class b/target/classes/com/cse3310/UserEvent.class
diff --git a/target/classes/com/cse3310/Version.class b/target/classes/com/cse3310/Version.class
diff --git a/target/classes/com/cse3310/Winner.class b/target/classes/com/cse3310/Winner.class
diff --git a/target/classes/com/cse3310/timerEvent.class b/target/classes/com/cse3310/timerEvent.class
diff --git a/target/cse3310-wordsearch.jar b/target/cse3310-wordsearch.jar
diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
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
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
diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
diff --git a/target/surefire-reports/TEST-com.cse3310.AppTest.xml b/target/surefire-reports/TEST-com.cse3310.AppTest.xml
diff --git a/target/surefire-reports/TEST-com.cse3310.UserTest.xml b/target/surefire-reports/TEST-com.cse3310.UserTest.xml