* Logging - Changed logging of gameStateEvaluator2.

This commit is contained in:
LevelX2 2013-12-31 12:59:07 +01:00
parent 7c4829cce4
commit 2708916cd6

View file

@ -24,11 +24,11 @@ import java.util.logging.Logger;
*/ */
public class GameStateEvaluator2 { public class GameStateEvaluator2 {
private static final transient Logger logger = Logging.getLogger(GameStateEvaluator2.class.getName()); private static final transient org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(GameStateEvaluator2.class);
// private static final transient Logger logger = Logging.getLogger(GameStateEvaluator2.class.getName());
static { // static {
logger.setLevel(Level.ALL); // logger.setLevel(Level.ALL);
} // }
public static final int WIN_GAME_SCORE = 100000000; public static final int WIN_GAME_SCORE = 100000000;
public static final int LOSE_GAME_SCORE = -WIN_GAME_SCORE; public static final int LOSE_GAME_SCORE = -WIN_GAME_SCORE;
@ -42,11 +42,13 @@ public class GameStateEvaluator2 {
Player player = game.getPlayer(playerId); Player player = game.getPlayer(playerId);
Player opponent = game.getPlayer(game.getOpponents(playerId).iterator().next()); Player opponent = game.getPlayer(game.getOpponents(playerId).iterator().next());
if (game.isGameOver()) { if (game.isGameOver()) {
if (player.hasLost() || opponent.hasWon()) if (player.hasLost() || opponent.hasWon()) {
return LOSE_GAME_SCORE; return LOSE_GAME_SCORE;
if (opponent.hasLost() || player.hasWon()) }
if (opponent.hasLost() || player.hasWon()) {
return WIN_GAME_SCORE; return WIN_GAME_SCORE;
} }
}
//int lifeScore = (player.getLife() - opponent.getLife()) * LIFE_FACTOR; //int lifeScore = (player.getLife() - opponent.getLife()) * LIFE_FACTOR;
//int lifeScore = (ArtificialScoringSystem.getLifeScore(player.getLife()) - opponent.getLife()) * LIFE_FACTOR; //int lifeScore = (ArtificialScoringSystem.getLifeScore(player.getLife()) - opponent.getLife()) * LIFE_FACTOR;
@ -68,7 +70,6 @@ public class GameStateEvaluator2 {
permanentScore -= evaluatePermanent(permanent, game); permanentScore -= evaluatePermanent(permanent, game);
} }
} catch (Throwable t) { } catch (Throwable t) {
t.printStackTrace();
} }
//permanentScore *= PERMANENT_FACTOR; //permanentScore *= PERMANENT_FACTOR;
@ -77,8 +78,7 @@ public class GameStateEvaluator2 {
handScore *= 5; handScore *= 5;
int score = lifeScore + permanentScore + handScore; int score = lifeScore + permanentScore + handScore;
//if (logger.isLoggable(Level.FINE)) logger.debug("game state evaluated to- lifeScore:" + lifeScore + " permanentScore:" + permanentScore + " handScore:" + handScore + " total:" + score);
logger.fine("game state evaluated to- lifeScore:" + lifeScore + " permanentScore:" + permanentScore /*+ " handScore:" + handScore*/ + "total:" + score);
return score; return score;
} }