X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmove.h;h=99e0c44d2e7d7a2822e5ae68f18e758f1a4e212b;hp=03df770dc824eee7849b37be806042fe0015c2d7;hb=35fa4fc71f7cf7b8f7ffc8a8c22f60048be99f86;hpb=e2e249eabd2493e2bb9e5e017aafaac074a706ef

diff --git a/src/move.h b/src/move.h
index 03df770d..99e0c44d 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 <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(MOVE_H_INCLUDED)
 #define MOVE_H_INCLUDED
 
-////
-//// Includes
-////
-
-#include <iostream>
+#include <string>
 
 #include "misc.h"
-#include "piece.h"
-#include "square.h"
+#include "types.h"
 
+// Maximum number of allowed moves per position
+const int MAX_MOVES = 256;
 
-////
-//// Types
-////
-
-class Position;
-
-/// 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,71 +51,81 @@ struct MoveStack {
   int score;
 };
 
-// Note that operator< is set up such that std::stable_sort() will sort in descending order
-inline bool operator<(const MoveStack& f, const MoveStack& s) { return s.score < f.score; }
-
-
-////
-//// Inline functions
-////
+inline bool operator<(const MoveStack& f, const MoveStack& s) { return f.score < s.score; }
+
+// An helper insertion sort implementation, works with pointers and iterators
+template<typename T, typename K>
+inline void sort(K firstMove, K lastMove)
+{
+    T value;
+    K cur, p, d;
+
+    if (firstMove != lastMove)
+        for (cur = firstMove + 1; cur != lastMove; cur++)
+        {
+            p = d = cur;
+            value = *p--;
+            if (*p < value)
+            {
+                do *d = *p;
+                while (--d != firstMove && *--p < value);
+                *d = value;
+            }
+        }
+}
 
 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 bool is_special(Move m) {
+  return m & (3 << 14);
 }
 
-inline int move_is_promotion(Move m) {
-  return m & (7 << 12);
+inline bool is_promotion(Move m) {
+  return (m & (3 << 14)) == (1 << 14);
 }
 
-inline int move_is_ep(Move m) {
-  return m & (1 << 15);
+inline int is_enpassant(Move m) {
+  return (m & (3 << 14)) == (2 << 14);
 }
 
-inline int move_is_castle(Move m) {
-  return m & (1 << 16);
+inline int is_castle(Move m) {
+  return (m & (3 << 14)) == (3 << 14);
 }
 
-inline bool move_is_short_castle(Move m) {
-  return move_is_castle(m) && (move_to(m) > move_from(m));
+inline PieceType promotion_piece_type(Move m) {
+  return PieceType(((m >> 12) & 3) + 2);
 }
 
-inline bool move_is_long_castle(Move m) {
-  return move_is_castle(m) && (move_to(m) < move_from(m));
+inline Move make_move(Square from, Square to) {
+  return Move(to | (from << 6));
 }
 
 inline Move make_promotion_move(Square from, Square to, PieceType promotion) {
-  return Move(int(to) | (int(from) << 6) | (int(promotion) << 12));
+  return Move(to | (from << 6) | (1 << 14) | ((promotion - 2) << 12)) ;
 }
 
-inline Move make_move(Square from, Square to) {
-  return Move(int(to) | (int(from) << 6));
+inline Move make_enpassant_move(Square from, Square to) {
+  return Move(to | (from << 6) | (2 << 14));
 }
 
 inline Move make_castle_move(Square from, Square to) {
-  return Move(int(to) | (int(from) << 6) | (1 << 16));
+  return Move(to | (from << 6) | (3 << 14));
 }
 
-inline Move make_ep_move(Square from, Square to) {
-  return Move(int(to) | (int(from) << 6) | (1 << 15));
+inline bool is_ok(Move m) {
+  return move_from(m) != move_to(m); // Catches also MOVE_NONE
 }
 
+class Position;
 
-////
-//// Prototypes
-////
-
-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);
-
+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);
 
 #endif // !defined(MOVE_H_INCLUDED)