X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmovegen.h;h=c2e7c3f1101bad9f5ec2d9ffcf85e956b70abb9c;hb=527d832a6de81c455cc8818e85c309fa1443f862;hp=84d5d35ef70b07789f98e4149de0cf4ae3f95e41;hpb=4b19430103ac75b574a6b269db447d359814b603;p=stockfish
diff --git a/src/movegen.h b/src/movegen.h
index 84d5d35e..c2e7c3f1 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-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2015-2020 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,25 +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
-MoveStack* generate(const Position& pos, MoveStack* 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)) {}
- void operator++() { cur++; }
- bool end() const { return cur == last; }
- Move move() const { return cur->move; }
- size_t size() const { return last - mlist; }
+ 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:
- MoveStack mlist[MAX_MOVES];
- MoveStack *cur, *last;
+ ExtMove moveList[MAX_MOVES], *last;
};
-#endif // !defined(MOVEGEN_H_INCLUDED)
+#endif // #ifndef MOVEGEN_H_INCLUDED