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

diff --git a/src/move.h b/src/move.h
index c4ed9dd8..99e0c44d 100644
--- a/src/move.h
+++ b/src/move.h
@@ -17,36 +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 MOVES_MAX = 256;
-
-////
-//// Types
-////
-
-class 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
@@ -68,7 +55,7 @@ inline bool operator<(const MoveStack& f, const MoveStack& s) { return f.score <
 
 // An helper insertion sort implementation, works with pointers and iterators
 template<typename T, typename K>
-inline void insertion_sort(K firstMove, K lastMove)
+inline void sort(K firstMove, K lastMove)
 {
     T value;
     K cur, p, d;
@@ -87,125 +74,58 @@ inline void insertion_sort(K firstMove, K lastMove)
         }
 }
 
-// Our dedicated sort in range [firstMove, lastMove), first splits
-// positive scores from ramining then order seaprately the two sets.
-template<typename T>
-inline void sort_moves(T* firstMove, T* lastMove, T** lastPositive)
-{
-    T tmp;
-    T *p, *d;
-
-    d = lastMove;
-    p = firstMove - 1;
-
-    d->score = -1; // right guard
-
-    // Split positives vs non-positives
-    do {
-        while ((++p)->score > 0) {}
-
-        if (p != d)
-        {
-            while (--d != p && d->score <= 0) {}
-
-            tmp = *p;
-            *p = *d;
-            *d = tmp;
-        }
-
-    } while (p != d);
-
-    // Sort just positive scored moves, remaining only when we get there
-    insertion_sort<T, T*>(firstMove, p);
-    *lastPositive = p;
-}
-
-// Picks up the best move in range [curMove, lastMove), one per cycle.
-// It is faster then sorting all the moves in advance when moves are few,
-// as normally are the possible captures. Note that is not a stable alghoritm.
-template<typename T>
-inline T pick_best(T* curMove, T* lastMove)
-{
-    T bestMove, tmp;
-
-    bestMove = *curMove;
-    while (++curMove != lastMove)
-    {
-        if (bestMove < *curMove)
-        {
-            tmp = *curMove;
-            *curMove = bestMove;
-            bestMove = tmp;
-        }
-    }
-    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 bool is_special(Move m) {
+  return m & (3 << 14);
 }
 
-inline int move_is_special(Move m) {
-  return m & (0x1F << 12);
+inline bool is_promotion(Move m) {
+  return (m & (3 << 14)) == (1 << 14);
 }
 
-inline int move_is_promotion(Move m) {
-  return m & (7 << 12);
+inline int is_enpassant(Move m) {
+  return (m & (3 << 14)) == (2 << 14);
 }
 
-inline int move_is_ep(Move m) {
-  return m & (1 << 15);
+inline int is_castle(Move m) {
+  return (m & (3 << 14)) == (3 << 14);
 }
 
-inline int move_is_castle(Move m) {
-  return m & (1 << 16);
+inline PieceType promotion_piece_type(Move m) {
+  return PieceType(((m >> 12) & 3) + 2);
 }
 
-inline bool move_is_short_castle(Move m) {
-  return move_is_castle(m) && (move_to(m) > move_from(m));
-}
-
-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_uci(const Position& pos, const std::string &str);
 extern const std::string move_to_uci(Move m, bool chess960);
-extern bool move_is_ok(Move m);
-
+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)