[gray-matter] r1623 committed - don't check for insufficient until there...

[codesite...@google.com]

Revision: 1623
Author: protonspring
Date: Tue Aug 3 19:45:07 2010
Log: don't check for insufficient until there
are not very many pieces left.

removed a few unnecessary checks.

http://code.google.com/p/gray-matter/source/detail?r=1623

Modified:
/trunk/inc/config.h
/trunk/inc/state.h
/trunk/src/board_base.cpp

=======================================
--- /trunk/inc/config.h Tue Aug 3 16:18:23 2010
+++ /trunk/inc/config.h Tue Aug 3 19:45:07 2010
@@ -53,7 +53,7 @@

//NOT a theoretical max, but should be sufficient for those
//of us who actually try to win
-#define MAX_MOVES_PER_GAME 300 // only X moves per game
+#define MAX_MOVES_PER_GAME 500 // only X moves per game

#define SPECIAL_SEARCH_DEPTH 5 // search X plys deeper for captures, etc.
(odd number)
#define R 1 // Null move pruning depth reduction
factor (in plies).
=======================================
--- /trunk/inc/state.h Mon Aug 2 19:58:09 2010
+++ /trunk/inc/state.h Tue Aug 3 19:45:07 2010
@@ -43,6 +43,7 @@
int en_passant; ///< En passant vulnerability.
bool on_move; ///< Color on move.
int fifty; ///< 50 move rule counter.
+ int pieceCount;
} state_t;

class stateArray
=======================================
--- /trunk/src/board_base.cpp Mon Aug 2 21:26:32 2010
+++ /trunk/src/board_base.cpp Tue Aug 3 19:45:07 2010
@@ -395,6 +395,8 @@
init_rotation();
init_hash();

+ state.pieceCount = get_num_pieces(WHITE) + get_num_pieces(BLACK);
+
// Sanity check the current state of the board resulting from the FEN
// string. For now, just make sure that both colors have one king each
// and that the color off move isn't in check.
@@ -430,6 +432,7 @@
state.en_passant = -1;
state.on_move = WHITE;
state.fifty = 0;
+ state.pieceCount = 32;
init_rotation();
init_hash();

@@ -514,7 +517,8 @@
case STALEMATE: return STALEMATE;
case CHECKMATE: return CHECKMATE;
}
- if (insufficient())
+ if (state.pieceCount < 5)
+ if (insufficient())
return INSUFFICIENT;
if (three())
return THREE;
@@ -721,12 +725,13 @@
// The move is a capture. Reset the 50 move rule counter.
state.fifty = -1;
retValue = true;
+ state.pieceCount--;
}
}

// If we're moving a piece from one of our rooks' initial positions,
then
// make sure that we're no longer marked able to castle on that
rook's side.
- if ((m.x1 == 0 || m.x1 == 7) && (m.y1 == (ON_MOVE ? 7 : 0)))
+ if ((m.x1 == 0 || m.x1 == 7) && (m.y1 == (ON_MOVE ? 7 : 0)))// &&
state.castle[ON_MOVE][m.x1 == 7] == CAN_CASTLE)
{
state.castle[ON_MOVE][m.x1 == 7] = CANT_CASTLE;
hash ^= key_castle[ON_MOVE][m.x1 == 7][CANT_CASTLE];
@@ -735,7 +740,7 @@
// If we're moving a piece to one of our opponent's rooks' initial
// positions, then make sure that our opponent is no longer marked
able to
// castle on that rook's side.
- if ((m.x2 == 0 || m.x2 == 7) && (m.y2 == (OFF_MOVE ? 7 : 0)) &&
state.castle[OFF_MOVE][m.x2 == 7] == CAN_CASTLE)
+ if ((m.x2 == 0 || m.x2 == 7) && (m.y2 == (OFF_MOVE ? 7 : 0)))// &&
state.castle[OFF_MOVE][m.x2 == 7] == CAN_CASTLE)
{
state.castle[OFF_MOVE][m.x2 == 7] = CANT_CASTLE;
hash ^= key_castle[OFF_MOVE][m.x1 == 7][CANT_CASTLE];
@@ -794,7 +799,8 @@
BIT_CLR(rotation[angle][OFF_MOVE],
coord[MAP][angle][m.x2][m.y1][X], coord[MAP][angle][m.x2][m.y1][Y]);
hash ^= key_piece[OFF_MOVE][PAWN][m.x2][m.y1];
pawn_hash ^= key_piece[OFF_MOVE][PAWN][m.x2][m.y1];
- }
+ state.pieceCount--;
+ }

// If we're advancing a pawn two squares, then mark it
vulnerable to en
// passant.
@@ -1242,6 +1248,7 @@
state.en_passant = -1;
state.on_move = WHITE;
state.fifty = 0;
+ state.pieceCount = 32;
}

/*----------------------------------------------------------------------------*\