Updated grader

Author: chen-robert

Diff for: src/connect4/connectFour/Grader.java

@@ -10,7 +10,9 @@
 public class Grader {
     private static final int ROWS = 6;
     private static final int COLS = 7;
-    
+
+    static int delay = 500;
+
     private static Board board;
     private static GamePanel gamePanel = new GamePanel(ROWS, COLS);
     private static HomePanel homePanel = new HomePanel(gamePanel, false);
@@ -19,46 +21,68 @@ public class Grader {
     static final String NAME1 = "Template";
     static final String NAME2 = "Template";
 
-    public static void main(String[] args) throws Exception
-    {
+    public static void main(String[] args) throws Exception {
         Class<?> bot1 = Class.forName("connect4.contestants." + NAME1);
         Class<?> bot2 = Class.forName("connect4.contestants." + NAME2);
 
-        Object a = bot1.getConstructor().newInstance();
-        Object b = bot2.getConstructor().newInstance();
+        Player a = (Player) bot1.getConstructor().newInstance();
+        Player b = (Player) bot2.getConstructor().newInstance();
 
         board = new Board(ROWS, COLS);
         gamePanel.drawGrid(board);
 
         Thread.sleep(1000);
 
-        playGame((Player) a, (Player) b);
+        playGame(a, b);
+        delay = 10;
+
+        for (int i = 0; i < 100 - 1; i++) {
+            board = new Board(ROWS, COLS);
+            gamePanel.drawGrid(board);
+            playGame(a, b);
+        }
+
+        String name1 = a.getPlayerName();
+        String name2 = b.getPlayerName();
+
+        if (name1.equals(name2)) name2 += "2";
+
+        debugger.println();
+        debugger.println();
+        debugger.println();
+        debugger.println(name1 + " won " + p1Wins + " times");
+        debugger.println(name2 + " won " + p2Wins + " times");
+        debugger.println("There were " + draws + " draws");
+
+        debugger.close();
     }
-    
-    public static void playGame(Player player1, Player player2) throws InterruptedException
-    {
+
+    static int p1Wins = 0;
+    static int p2Wins = 0;
+    static int draws = 0;
+
+    public static void playGame(Player player1, Player player2) throws InterruptedException {
         String name1 = player1.getPlayerName();
         String name2 = player2.getPlayerName();
 
-        if(name1.equals(name2)) name2 += "2";
+        if (name1.equals(name2)) name2 += "2";
 
         int winningPlayer = 0;
-        while (winningPlayer == 0)
-        {
-            Thread.sleep(500);
-        	int move = getMove(player1);
+        while (winningPlayer == 0) {
+            Thread.sleep(delay);
+            int move = getMove(player1);
             debugger.println(name1 + " dropped in " + move);
-            
-            if(!board.makeMove(move)){
+
+            if (!board.makeMove(move)) {
                 System.err.println(name1 + " made an illegal move");
                 return;
             }
             gamePanel.drawGrid(board);
             winningPlayer = board.getWinningPlayer();
             if (winningPlayer == 0) {
-                Thread.sleep(500);
-            	move = getMove(player2);
-                if(!board.makeMove(move)){
+                Thread.sleep(delay);
+                move = getMove(player2);
+                if (!board.makeMove(move)) {
                     System.err.println(name2 + " made an illegal move");
                     return;
                 }
@@ -68,36 +92,38 @@ public static void playGame(Player player1, Player player2) throws InterruptedEx
             }
         }
 
-        if (winningPlayer == -1)
-        {
+        if (winningPlayer == -1) {
             System.out.println("Game over. It was a draw.");
             debugger.println("Game over. It was a draw.");
+
+            draws++;
             return;
         }
-        String winningPlayerName = 
-                (winningPlayer == 1) ? name1: name2;
+        String winningPlayerName =
+                (winningPlayer == 1) ? name1 : name2;
+
+        if(winningPlayer == 1) p1Wins++;
+        else p2Wins++;
 
         debugger.println("Game over.  Player " + winningPlayer + ": " + winningPlayerName + " won.");
-        debugger.close();
     }
-    
+
     public static int getMove(Player player) throws InterruptedException {
-    	int move;
-    	if(player instanceof HumanPlayer) {
-        	move = player.getMoveColumn(board);
-        	while(move == -1) {
-        		move = player.getMoveColumn(board);
-        		Thread.sleep(20);
-        	}
+        int move;
+        if (player instanceof HumanPlayer) {
+            move = player.getMoveColumn(board);
+            while (move == -1) {
+                move = player.getMoveColumn(board);
+                Thread.sleep(20);
+            }
             ((HumanPlayer) player).setCol(-1);
-    	} else {
-    		move = player.getMoveColumn(board);
-    	}
-    	return move;
+        } else {
+            move = player.getMoveColumn(board);
+        }
+        return move;
     }
 
-    public static GamePanel getGamePanel()
-    {
+    public static GamePanel getGamePanel() {
         return gamePanel;
     }
 }