From 0aa218f6ea42e138597d942bc6b0615d737a3f68 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 26 Feb 2013 08:28:36 +0100 Subject: [PATCH] Minor changes to logging of ComputerPlayer. --- .../src/mage/player/ai/ComputerPlayer6.java | 20 ++++++++++--------- .../src/mage/player/ai/ComputerPlayer7.java | 14 ++++++------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java index 37ee17215ae..b120daf40ac 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java @@ -450,21 +450,21 @@ public class ComputerPlayer6 extends ComputerPlayer implements if (Thread.interrupted()) { Thread.currentThread().interrupt(); val = GameStateEvaluator2.evaluate(playerId, game); - logger.info("interrupted - " + val); + logger.trace("interrupted - " + val); return val; } if (depth <= 0 || SimulationNode2.nodeCount > maxNodes || game.isGameOver()) { - logger.debug("Simulating -- reached end state, node count=" + SimulationNode2.nodeCount + ", depth=" + depth); + logger.trace("Simulating -- reached end state, node count=" + SimulationNode2.nodeCount + ", depth=" + depth); val = GameStateEvaluator2.evaluate(playerId, game); UUID currentPlayerId = node.getGame().getPlayerList().get(); //logger.info("reached - " + val + ", playerId=" + playerId + ", node.pid="+currentPlayerId); return val; } else if (node.getChildren().size() > 0) { - logger.debug("Simulating -- something added children:" + node.getChildren().size()); + logger.trace("Simulating -- something added children:" + node.getChildren().size()); val = minimaxAB(node, depth - 1, alpha, beta); return val; } else { - logger.debug("Simulating -- alpha: " + alpha + " beta: " + beta + " depth:" + depth + " step:" + game.getTurn().getStepType() + " for player:" + (node.getPlayerId().equals(playerId) ? "yes" : "no")); + logger.trace("Simulating -- alpha: " + alpha + " beta: " + beta + " depth:" + depth + " step:" + game.getTurn().getStepType() + " for player:" + (node.getPlayerId().equals(playerId) ? "yes" : "no")); if (allPassed(game)) { if (!game.getStack().isEmpty()) { resolve(node, depth, game); @@ -485,7 +485,7 @@ public class ComputerPlayer6 extends ComputerPlayer implements } } - logger.debug("returning -- score: " + val + " depth:" + depth + " step:" + game.getTurn().getStepType() + " for player:" + game.getPlayer(node.getPlayerId()).getName()); + logger.trace("returning -- score: " + val + " depth:" + depth + " step:" + game.getTurn().getStepType() + " for player:" + game.getPlayer(node.getPlayerId()).getName()); return val; } @@ -502,9 +502,10 @@ public class ComputerPlayer6 extends ComputerPlayer implements SimulationNode2 bestNode = null; List allActions = currentPlayer.simulatePriority(game); optimize(game, allActions); - logger.debug("Simulating -- adding " + allActions.size() + " children:" + allActions); + logger.debug("Simulating -- (depth=" + depth + ") adding " + allActions.size() + " children:" + allActions); + int counter = 0; for (Ability action : allActions) { - logger.debug(new StringBuilder("Simulating -- actions: " + allActions.size() + " -> " + action)); + logger.debug(new StringBuilder("Simulating -- actions: [" + ++counter + "] " + " -> " + action)); if (Thread.interrupted()) { Thread.currentThread().interrupt(); logger.debug("Simulating -- interrupted"); @@ -522,10 +523,11 @@ public class ComputerPlayer6 extends ComputerPlayer implements sim.getPlayerList().getNext(); } SimulationNode2 newNode = new SimulationNode2(node, sim, action, depth, currentPlayer.getId()); - int testVal = GameStateEvaluator2.evaluate(currentPlayer.getId(), sim); - logger.debug("Simulating -- node #:" + SimulationNode2.getCount() + " actions:" + action); + // int testVal = GameStateEvaluator2.evaluate(currentPlayer.getId(), sim); + sim.checkStateAndTriggered(); int val = addActions(newNode, depth - 1, alpha, beta); + logger.debug("Simulating -- val = " + val + " depth= " + depth + " (" + action +")"); if (!currentPlayer.getId().equals(playerId)) { if (val < beta) { beta = val; diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java index e89acf06fe8..45b8f669ee7 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java @@ -192,16 +192,15 @@ public class ComputerPlayer7 extends ComputerPlayer6 implements Player { return GameStateEvaluator2.evaluate(playerId, game); } if (depth <= 0 || SimulationNode2.nodeCount > maxNodes || game.isGameOver()) { - logger.debug("simulating -- reached end state"); + logger.debug("Simulating -- reached end state"); val = GameStateEvaluator2.evaluate(playerId, game); } else if (node.getChildren().size() > 0) { - logger.debug("simulating -- somthing added children:" + node.getChildren().size()); + logger.debug("Simulating -- something added children:" + node.getChildren().size()); val = minimaxAB(node, depth-1, alpha, beta); } else { - if (logger.isDebugEnabled()) - logger.debug("simulating -- alpha: " + alpha + " beta: " + beta + " depth:" + depth + " step:" + game.getTurn().getStepType() + " for player:" + game.getPlayer(game.getPlayerList().get()).getName()); + logger.trace("Simulating -- alpha: " + alpha + " beta: " + beta + " depth:" + depth + " step:" + game.getTurn().getStepType() + " for player:" + game.getPlayer(game.getPlayerList().get()).getName()); if (allPassed(game)) { if (!game.getStack().isEmpty()) { resolve(node, depth, game); @@ -215,7 +214,7 @@ public class ComputerPlayer7 extends ComputerPlayer6 implements Player { val = GameStateEvaluator2.evaluate(playerId, game); } else if (stepFinished) { - logger.debug("step finished"); + logger.debug("Step finished"); int testScore = GameStateEvaluator2.evaluate(playerId, game); if (game.getActivePlayerId().equals(playerId)) { if (testScore < currentScore) { @@ -248,7 +247,7 @@ public class ComputerPlayer7 extends ComputerPlayer6 implements Player { } } else if (node.getChildren().size() > 0) { - logger.debug("simulating -- trigger added children:" + node.getChildren().size()); + logger.debug("Simulating -- trigger added children:" + node.getChildren().size()); val = minimaxAB(node, depth, alpha, beta); } else { @@ -256,8 +255,7 @@ public class ComputerPlayer7 extends ComputerPlayer6 implements Player { } } - if (logger.isDebugEnabled()) - logger.debug("returning -- score: " + val + " depth:" + depth + " step:" + game.getTurn().getStepType() + " for player:" + game.getPlayer(node.getPlayerId()).getName()); + logger.trace("returning -- score: " + val + " depth:" + depth + " step:" + game.getTurn().getStepType() + " for player:" + game.getPlayer(node.getPlayerId()).getName()); return val; }