github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-10 01:01:05 -09:00
Code Issues Projects Releases Packages Wiki Activity

Minor changes to logging of ComputerPlayer.

Browse source
This commit is contained in:
LevelX2 2013-02-26 08:28:36 +01:00
parent 2ac3073abf
commit 0aa218f6ea
2 changed files with 17 additions and 17 deletions
Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai
ComputerPlayer6.javaComputerPlayer7.java

20
Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java
View file

@ -450,21 +450,21 @@ public class ComputerPlayer6 extends ComputerPlayer<ComputerPlayer6> implements
if (Thread.interrupted()) { if (Thread.interrupted()) {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
val = GameStateEvaluator2.evaluate(playerId, game); val = GameStateEvaluator2.evaluate(playerId, game);
logger.info("interrupted - " + val); logger.trace("interrupted - " + val);
return val; return val;
} }
if (depth <= 0 || SimulationNode2.nodeCount > maxNodes || game.isGameOver()) { 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); val = GameStateEvaluator2.evaluate(playerId, game);
UUID currentPlayerId = node.getGame().getPlayerList().get(); UUID currentPlayerId = node.getGame().getPlayerList().get();
//logger.info("reached - " + val + ", playerId=" + playerId + ", node.pid="+currentPlayerId); //logger.info("reached - " + val + ", playerId=" + playerId + ", node.pid="+currentPlayerId);
return val; return val;
} else if (node.getChildren().size() > 0) { } 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); val = minimaxAB(node, depth - 1, alpha, beta);
return val; return val;
} else { } 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 (allPassed(game)) {
if (!game.getStack().isEmpty()) { if (!game.getStack().isEmpty()) {
resolve(node, depth, game); resolve(node, depth, game);
@ -485,7 +485,7 @@ public class ComputerPlayer6 extends ComputerPlayer<ComputerPlayer6> 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; return val;
} }
@ -502,9 +502,10 @@ public class ComputerPlayer6 extends ComputerPlayer<ComputerPlayer6> implements
SimulationNode2 bestNode = null; SimulationNode2 bestNode = null;
List<Ability> allActions = currentPlayer.simulatePriority(game); List<Ability> allActions = currentPlayer.simulatePriority(game);
optimize(game, allActions); 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) { for (Ability action : allActions) {
logger.debug(new StringBuilder("Simulating -- actions: " + allActions.size() + " -> " + action)); logger.debug(new StringBuilder("Simulating -- actions: [" + ++counter + "] " + " -> " + action));
if (Thread.interrupted()) { if (Thread.interrupted()) {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
logger.debug("Simulating -- interrupted"); logger.debug("Simulating -- interrupted");
@ -522,10 +523,11 @@ public class ComputerPlayer6 extends ComputerPlayer<ComputerPlayer6> implements
sim.getPlayerList().getNext(); sim.getPlayerList().getNext();
} }
SimulationNode2 newNode = new SimulationNode2(node, sim, action, depth, currentPlayer.getId()); SimulationNode2 newNode = new SimulationNode2(node, sim, action, depth, currentPlayer.getId());
int testVal = GameStateEvaluator2.evaluate(currentPlayer.getId(), sim); // int testVal = GameStateEvaluator2.evaluate(currentPlayer.getId(), sim);
logger.debug("Simulating -- node #:" + SimulationNode2.getCount() + " actions:" + action);
sim.checkStateAndTriggered(); sim.checkStateAndTriggered();
int val = addActions(newNode, depth - 1, alpha, beta); int val = addActions(newNode, depth - 1, alpha, beta);
logger.debug("Simulating -- val = " + val + " depth= " + depth + " (" + action +")");
if (!currentPlayer.getId().equals(playerId)) { if (!currentPlayer.getId().equals(playerId)) {
if (val < beta) { if (val < beta) {
beta = val; beta = val;

14
Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java
View file

@ -192,16 +192,15 @@ public class ComputerPlayer7 extends ComputerPlayer6 implements Player {
return GameStateEvaluator2.evaluate(playerId, game); return GameStateEvaluator2.evaluate(playerId, game);
} }
if (depth <= 0 || SimulationNode2.nodeCount > maxNodes || game.isGameOver()) { 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); val = GameStateEvaluator2.evaluate(playerId, game);
} }
else if (node.getChildren().size() > 0) { 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); val = minimaxAB(node, depth-1, alpha, beta);
} }
else { else {
if (logger.isDebugEnabled()) logger.trace("Simulating -- alpha: " + alpha + " beta: " + beta + " depth:" + depth + " step:" + game.getTurn().getStepType() + " for player:" + game.getPlayer(game.getPlayerList().get()).getName());
logger.debug("simulating -- alpha: " + alpha + " beta: " + beta + " depth:" + depth + " step:" + game.getTurn().getStepType() + " for player:" + game.getPlayer(game.getPlayerList().get()).getName());
if (allPassed(game)) { if (allPassed(game)) {
if (!game.getStack().isEmpty()) { if (!game.getStack().isEmpty()) {
resolve(node, depth, game); resolve(node, depth, game);
@ -215,7 +214,7 @@ public class ComputerPlayer7 extends ComputerPlayer6 implements Player {
val = GameStateEvaluator2.evaluate(playerId, game); val = GameStateEvaluator2.evaluate(playerId, game);
} }
else if (stepFinished) { else if (stepFinished) {
logger.debug("step finished"); logger.debug("Step finished");
int testScore = GameStateEvaluator2.evaluate(playerId, game); int testScore = GameStateEvaluator2.evaluate(playerId, game);
if (game.getActivePlayerId().equals(playerId)) { if (game.getActivePlayerId().equals(playerId)) {
if (testScore < currentScore) { if (testScore < currentScore) {
@ -248,7 +247,7 @@ public class ComputerPlayer7 extends ComputerPlayer6 implements Player {
} }
} }
else if (node.getChildren().size() > 0) { 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); val = minimaxAB(node, depth, alpha, beta);
} }
else { else {
@ -256,8 +255,7 @@ public class ComputerPlayer7 extends ComputerPlayer6 implements Player {
} }
} }
if (logger.isDebugEnabled()) logger.trace("returning -- score: " + val + " depth:" + depth + " step:" + game.getTurn().getStepType() + " for player:" + game.getPlayer(node.getPlayerId()).getName());
logger.debug("returning -- score: " + val + " depth:" + depth + " step:" + game.getTurn().getStepType() + " for player:" + game.getPlayer(node.getPlayerId()).getName());
return val; return val;
} }