diff --git a/.classpath b/.classpath index ae23745..371ffc0 100644 --- a/.classpath +++ b/.classpath @@ -5,6 +5,5 @@ - diff --git a/lib/log4j-1.2.16.jar b/lib/log4j-1.2.16.jar deleted file mode 100644 index 3f9d847..0000000 Binary files a/lib/log4j-1.2.16.jar and /dev/null differ diff --git a/src/model/Referee.java b/src/model/Referee.java index b1efdf1..ba8a515 100644 --- a/src/model/Referee.java +++ b/src/model/Referee.java @@ -6,8 +6,6 @@ import model.comPlayer.Player; import model.playerModel.GameGoal; import model.playerModel.PlayerModel; -import org.apache.log4j.Logger; - import view.BoardPanel; import view.HighScoreDialog; import view.MainFrame; @@ -16,8 +14,6 @@ import view.ScorePanel; public class Referee implements Runnable { public static final String COM_TURN = "Waiting for the computer's move."; public static final String GAME_OVER = "Game over!"; - public static final Logger LOGGER = Logger.getLogger(Referee.class - .getName()); public static final String PLAYER_TURN = "Waiting for the player's move."; @@ -153,7 +149,6 @@ public class Referee implements Runnable { } private void play() { - int plies = 0; while (!isOver()) { if (board.isPlayerTurn()) { boolean wasInterrupted = false; @@ -197,7 +192,7 @@ public class Referee implements Runnable { getScorePanel().updateScore(getPlayerScore()); mf.updateMessage(getMessage()); boardPanel.updateIcons(); - LOGGER.info("plies: " + plies++); + try { Thread.sleep(250L); } catch (InterruptedException ie) { diff --git a/src/model/comPlayer/generator/AlphaBetaMoveGenerator.java b/src/model/comPlayer/generator/AlphaBetaMoveGenerator.java index 4034cf5..fc860eb 100644 --- a/src/model/comPlayer/generator/AlphaBetaMoveGenerator.java +++ b/src/model/comPlayer/generator/AlphaBetaMoveGenerator.java @@ -8,12 +8,8 @@ import model.BoardScorer; import model.Move; import model.SearchResult; -import org.apache.log4j.Logger; - public class AlphaBetaMoveGenerator implements MoveGenerator { private static final int DEFAULT_RECURSIVE_PLAYS = 1; - private static final Logger LOGGER = Logger - .getLogger(AlphaBetaMoveGenerator.class.getName()); private final BoardScorer scorer = new BoardScorer(); private final ValidMoveGenerator validMoveGenerator = new ValidMoveGenerator(); @@ -36,7 +32,6 @@ public class AlphaBetaMoveGenerator implements MoveGenerator { @Override public List genMoves(Board board, boolean asHuman, int nMoves) { Move[] doNothing = new Move[] { Move.NONE }; - LOGGER.info("Minimax genMoves() stub returning []"); return Arrays.asList(doNothing); } diff --git a/src/model/comPlayer/generator/MinimaxMoveGenerator.java b/src/model/comPlayer/generator/MinimaxMoveGenerator.java index ea6d256..8752817 100644 --- a/src/model/comPlayer/generator/MinimaxMoveGenerator.java +++ b/src/model/comPlayer/generator/MinimaxMoveGenerator.java @@ -8,11 +8,7 @@ import model.BoardScorer; import model.Move; import model.SearchResult; -import org.apache.log4j.Logger; - public class MinimaxMoveGenerator implements MoveGenerator { - private static final Logger LOGGER = Logger - .getLogger(MinimaxMoveGenerator.class.getName()); private static final int DEFAULT_RECURSIVE_PLAYS = 2; private final BoardScorer scorer = new BoardScorer(); @@ -93,13 +89,9 @@ public class MinimaxMoveGenerator implements MoveGenerator { return recursionLevel < 1; } - /** - * AlphaBetaMoveGenerator2 does not support this method. - */ @Override public List genMoves(Board board, boolean asHuman, int nMoves) { Move[] doNothing = new Move[] { Move.NONE }; - LOGGER.info("Minimax genMoves() stub returning []"); return Arrays.asList(doNothing); } } diff --git a/src/model/comPlayer/generator/MonteCarloMoveGenerator.java b/src/model/comPlayer/generator/MonteCarloMoveGenerator.java index b9f0390..c5c7ddf 100644 --- a/src/model/comPlayer/generator/MonteCarloMoveGenerator.java +++ b/src/model/comPlayer/generator/MonteCarloMoveGenerator.java @@ -8,11 +8,7 @@ import model.BoardScorer; import model.Move; import model.SearchResult; -import org.apache.log4j.Logger; - public class MonteCarloMoveGenerator implements MoveGenerator { - private static final Logger LOGGER = Logger - .getLogger(MonteCarloMoveGenerator.class.getName()); private static final int DEFAULT_RECURSIVE_PLAYS = 3; private static final int MOVES_PER_LEVEL = 12; @@ -73,13 +69,9 @@ public class MonteCarloMoveGenerator implements MoveGenerator { return new SearchResult(bestResult.move, (int)Math.round((double)totalScore / validMoves.size())); } - /** - * AlphaBetaMoveGenerator2 does not support this method. - */ @Override public List genMoves(Board board, boolean asHuman, int nMoves) { Move[] doNothing = new Move[] { Move.NONE }; - LOGGER.info("Minimax genMoves() stub returning []"); return Arrays.asList(doNothing); } } \ No newline at end of file diff --git a/src/model/comPlayer/generator/ValidMoveGenerator.java b/src/model/comPlayer/generator/ValidMoveGenerator.java index 957fc8e..f4879a4 100644 --- a/src/model/comPlayer/generator/ValidMoveGenerator.java +++ b/src/model/comPlayer/generator/ValidMoveGenerator.java @@ -9,15 +9,9 @@ import model.Board.TileColor; import model.CellPointer; import model.Move; -import org.apache.log4j.Logger; - public class ValidMoveGenerator implements MoveGenerator { - private static final Logger LOGGER = Logger - .getLogger(ValidMoveGenerator.class.getName()); - @Override public Move genMove(Board board, boolean asHuman) { - LOGGER.info("ValidMoveGenerator genMove() stub returning NONE"); return Move.NONE; }