X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmovegen.h;h=9bf2a46834d702a4b70d4dc9a287757b8d18ea06;hb=4a0db9ea3c34d7663a039c40ce810ba9cb743cca;hp=71e9ca039870d08a6ebb364144c7d122d02a791e;hpb=99e547f4cb190e462d0c582b731a0fcf25ce1545;p=stockfish
diff --git a/src/movegen.h b/src/movegen.h
index 71e9ca03..9bf2a468 100644
--- a/src/movegen.h
+++ b/src/movegen.h
@@ -1,7 +1,8 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2015-2018 Marco Costalba, Joona Kiiski, Gary Linscott, 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,11 +18,15 @@
along with this program. If not, see .
*/
-#if !defined(MOVEGEN_H_INCLUDED)
+#ifndef MOVEGEN_H_INCLUDED
#define MOVEGEN_H_INCLUDED
+#include
+
#include "types.h"
+class Position;
+
enum GenType {
CAPTURES,
QUIETS,
@@ -31,28 +36,40 @@ enum GenType {
LEGAL
};
-class Position;
+struct ExtMove {
+ Move move;
+ int value;
+
+ operator Move() const { return move; }
+ void operator=(Move m) { move = m; }
+
+ // Inhibit unwanted implicit conversions to Move
+ // with an ambiguity that yields to a compile error.
+ operator float() const = delete;
+};
+
+inline bool operator<(const ExtMove& f, const ExtMove& s) {
+ return f.value < s.value;
+}
template
-ExtMove* generate(const Position& pos, ExtMove* mlist);
+ExtMove* generate(const Position& pos, ExtMove* moveList);
-/// The MoveList struct is a simple wrapper around generate(), sometimes comes
-/// handy to use this class instead of the low level generate() function.
+/// The MoveList struct is a simple wrapper around generate(). It sometimes comes
+/// in handy to use this class instead of the low level generate() function.
template
struct MoveList {
- explicit MoveList(const Position& pos) : cur(mlist), last(generate(pos, mlist)) { last->move = MOVE_NONE; }
- void operator++() { cur++; }
- Move operator*() const { return cur->move; }
- size_t size() const { return last - mlist; }
- bool contains(Move m) const {
- for (const ExtMove* it(mlist); it != last; ++it) if (it->move == m) return true;
- return false;
+ explicit MoveList(const Position& pos) : last(generate(pos, moveList)) {}
+ const ExtMove* begin() const { return moveList; }
+ const ExtMove* end() const { return last; }
+ size_t size() const { return last - moveList; }
+ bool contains(Move move) const {
+ return std::find(begin(), end(), move) != end();
}
private:
- ExtMove mlist[MAX_MOVES];
- ExtMove *cur, *last;
+ ExtMove moveList[MAX_MOVES], *last;
};
-#endif // !defined(MOVEGEN_H_INCLUDED)
+#endif // #ifndef MOVEGEN_H_INCLUDED