X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fmove.h;h=3d97799741667d73c2009a65265f93fe503e9fd2;hb=7f519a246327e164056bbd3e77ed5a672618094d;hp=db2529c3df6effc009688ef2f57fb94c3a105a8a;hpb=a46b53e1c21ba56b09d7d9e47335d383b5240ce0;p=stockfish
diff --git a/src/move.h b/src/move.h
index db2529c3..3d977997 100644
--- a/src/move.h
+++ b/src/move.h
@@ -17,28 +17,16 @@
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"
+#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 16 bits to be stored
///
@@ -67,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
-inline void insertion_sort(K firstMove, K lastMove)
+inline void sort(K firstMove, K lastMove)
{
T value;
K cur, p, d;
@@ -86,66 +74,8 @@ 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
-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(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
-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) {
@@ -168,42 +98,35 @@ inline int move_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 bool move_is_long_castle(Move m) {
- return move_is_castle(m) && (move_to(m) < move_from(m));
-}
-
-inline PieceType move_promotion_piece(Move m) {
- return move_is_promotion(m) ? PieceType(((int(m) >> 12) & 3) + 2) : PIECE_TYPE_NONE;
+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_promotion_move(Square from, Square to, PieceType promotion) {
- return Move(int(to) | (int(from) << 6) | ((int(promotion) - 2) << 12) | (1 << 14));
+ return Move(to | (from << 6) | (1 << 14) | ((promotion - 2) << 12)) ;
}
inline Move make_ep_move(Square from, Square to) {
- return Move(int(to) | (int(from) << 6) | (2 << 14));
+ return Move(to | (from << 6) | (2 << 14));
}
inline Move make_castle_move(Square from, Square to) {
- return Move(int(to) | (int(from) << 6) | (3 << 14));
+ return Move(to | (from << 6) | (3 << 14));
}
+inline bool move_is_ok(Move m) {
+ return move_from(m) != move_to(m); // Catches also MOVE_NONE
+}
-////
-//// Prototypes
-////
+class Position;
-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);
+extern const std::string pretty_pv(Position& pos, int depth, Value score, int time, Move pv[]);
#endif // !defined(MOVE_H_INCLUDED)