X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmove.h;h=d06e381a761c819a6b93c88f9093e532a73b7534;hp=06c9969ffb7e07929f3dcb5d5dd34445bd5880fe;hb=1a20d727019548de69314a90ae59a3b8a76b4ae7;hpb=56de5ae5616bf8766491d2585751b11da268559c diff --git a/src/move.h b/src/move.h index 06c9969f..d06e381a 100644 --- a/src/move.h +++ b/src/move.h @@ -64,25 +64,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; } } @@ -117,7 +116,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; } @@ -132,7 +131,7 @@ inline T pick_best(T* curMove, T* lastMove) bestMove = *curMove; while (++curMove != lastMove) { - if (*curMove < bestMove) + if (bestMove < *curMove) { tmp = *curMove; *curMove = bestMove; @@ -208,5 +207,4 @@ 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); - #endif // !defined(MOVE_H_INCLUDED)