X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmove.h;h=42d3bbe9750d31e55993911d6c72f704d255d12f;hp=0cf6ac6301b4baa350788e6352b57b7098a8d3c5;hb=b21a5e2f0638a55daeaa98ba95afc6c016ea0b6e;hpb=c7866a4215c31d7d0af8e8550fbf8c13f6ea1d1a
diff --git a/src/move.h b/src/move.h
index 0cf6ac63..42d3bbe9 100644
--- a/src/move.h
+++ b/src/move.h
@@ -1,7 +1,7 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2009 Marco Costalba
+ Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,34 +17,23 @@
along with this program. If not, see .
*/
-
#if !defined(MOVE_H_INCLUDED)
#define MOVE_H_INCLUDED
-////
-//// Includes
-////
-
-#include
+#include
#include "misc.h"
-#include "piece.h"
-#include "square.h"
-
-
-////
-//// Types
-////
+#include "types.h"
-class Position;
+// Maximum number of allowed moves per position
+const int MAX_MOVES = 256;
-/// A move needs 17 bits to be stored
+/// A move needs 16 bits to be stored
///
/// bit 0- 5: destination square (from 0 to 63)
/// bit 6-11: origin square (from 0 to 63)
-/// bit 12-14: promotion piece type
-/// bit 15: en passant flag
-/// bit 16: castle flag
+/// bit 12-13: promotion piece type - 2 (from KNIGHT-2 to QUEEN-2)
+/// bit 14-15: special move flag: promotion (1), en passant (2), castle (3)
///
/// Special cases are MOVE_NONE and MOVE_NULL. We can sneak these in
/// because in any normal move destination square is always different
@@ -62,25 +51,24 @@ struct MoveStack {
int score;
};
-// Note that operator< is set up such that sorting will be in descending order
-inline bool operator<(const MoveStack& f, const MoveStack& s) { return s.score < f.score; }
+inline bool operator<(const MoveStack& f, const MoveStack& s) { return f.score < s.score; }
-// An helper insertion sort implementation
-template
-inline void insertion_sort(T* firstMove, T* lastMove)
+// An helper insertion sort implementation, works with pointers and iterators
+template
+inline void insertion_sort(K firstMove, K lastMove)
{
T value;
- T *cur, *p, *d;
+ K cur, p, d;
if (firstMove != lastMove)
for (cur = firstMove + 1; cur != lastMove; cur++)
{
p = d = cur;
value = *p--;
- if (value < *p)
+ if (*p < value)
{
do *d = *p;
- while (--d != firstMove && value < *--p);
+ while (--d != firstMove && *--p < value);
*d = value;
}
}
@@ -101,11 +89,11 @@ inline void sort_moves(T* firstMove, T* lastMove, T** lastPositive)
// Split positives vs non-positives
do {
- while ((++p)->score > 0);
+ while ((++p)->score > 0) {}
if (p != d)
{
- while (--d != p && d->score <= 0);
+ while (--d != p && d->score <= 0) {}
tmp = *p;
*p = *d;
@@ -115,7 +103,7 @@ inline void sort_moves(T* firstMove, T* lastMove, T** lastPositive)
} while (p != d);
// Sort just positive scored moves, remaining only when we get there
- insertion_sort(firstMove, p);
+ insertion_sort(firstMove, p);
*lastPositive = p;
}
@@ -130,7 +118,7 @@ inline T pick_best(T* curMove, T* lastMove)
bestMove = *curMove;
while (++curMove != lastMove)
{
- if (*curMove < bestMove)
+ if (bestMove < *curMove)
{
tmp = *curMove;
*curMove = bestMove;
@@ -140,36 +128,29 @@ inline T pick_best(T* curMove, T* lastMove)
return bestMove;
}
-////
-//// Inline functions
-////
inline Square move_from(Move m) {
- return Square((int(m) >> 6) & 0x3F);
+ return Square((m >> 6) & 0x3F);
}
inline Square move_to(Move m) {
return Square(m & 0x3F);
}
-inline PieceType move_promotion_piece(Move m) {
- return PieceType((int(m) >> 12) & 7);
-}
-
-inline int move_is_special(Move m) {
- return m & (0x1F << 12);
+inline bool move_is_special(Move m) {
+ return m & (3 << 14);
}
-inline int move_is_promotion(Move m) {
- return m & (7 << 12);
+inline bool move_is_promotion(Move m) {
+ return (m & (3 << 14)) == (1 << 14);
}
inline int move_is_ep(Move m) {
- return m & (1 << 15);
+ return (m & (3 << 14)) == (2 << 14);
}
inline int move_is_castle(Move m) {
- return m & (1 << 16);
+ return (m & (3 << 14)) == (3 << 14);
}
inline bool move_is_short_castle(Move m) {
@@ -180,31 +161,35 @@ inline bool move_is_long_castle(Move m) {
return move_is_castle(m) && (move_to(m) < move_from(m));
}
-inline Move make_promotion_move(Square from, Square to, PieceType promotion) {
- return Move(int(to) | (int(from) << 6) | (int(promotion) << 12));
+inline PieceType promotion_piece_type(Move m) {
+ return PieceType(((m >> 12) & 3) + 2);
}
inline Move make_move(Square from, Square to) {
- return Move(int(to) | (int(from) << 6));
+ return Move(to | (from << 6));
}
-inline Move make_castle_move(Square from, Square to) {
- return Move(int(to) | (int(from) << 6) | (1 << 16));
+inline Move make_promotion_move(Square from, Square to, PieceType promotion) {
+ return Move(to | (from << 6) | ((promotion - 2) << 12) | (1 << 14));
}
inline Move make_ep_move(Square from, Square to) {
- return Move(int(to) | (int(from) << 6) | (1 << 15));
+ return Move(to | (from << 6) | (2 << 14));
}
+inline Move make_castle_move(Square from, Square to) {
+ return Move(to | (from << 6) | (3 << 14));
+}
-////
-//// Prototypes
-////
+inline bool move_is_ok(Move m) {
+ return move_from(m) != move_to(m); // Catches also MOVE_NONE
+}
-extern std::ostream& operator<<(std::ostream &os, Move m);
-extern Move move_from_string(const Position &pos, const std::string &str);
-extern const std::string move_to_string(Move m);
-extern bool move_is_ok(Move m);
+class Position;
+extern const std::string move_to_uci(Move m, bool chess960);
+extern Move move_from_uci(const Position& pos, const std::string& str);
+extern const std::string move_to_san(Position& pos, Move m);
+extern const std::string pretty_pv(Position& pos, int depth, Value score, int time, Move pv[]);
#endif // !defined(MOVE_H_INCLUDED)