kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-07-11 19:49:14 +00:00
Code Issues Releases Wiki Activity

Mimic an iterator for looping across MoveList

Browse source 
Seems more conventional.

No functional change.
This commit is contained in:
Marco Costalba 2013-05-19 13:28:25 +02:00
parent f7c013edd0
commit 8ceef92266
6 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/book.cpp
View file

@ -436,9 +436,9 @@ Move PolyglotBook::probe(const Position& pos, const string& fName, bool pickBest
move = make<PROMOTION>(from_sq(move), to_sq(move), PieceType(pt + 1));
// Add 'special move' flags and verify it is legal
for (MoveList<LEGAL> ml(pos); !ml.end(); ++ml)
if (move == (ml.move() ^ type_of(ml.move())))
return ml.move();
for (MoveList<LEGAL> it(pos); !it.end(); ++it)
if (move == (*it ^ type_of(*it)))
return *it;
return MOVE_NONE;
}

2
src/movegen.h
View file

@ -43,8 +43,8 @@ struct MoveList {
explicit MoveList(const Position& pos) : cur(mlist), last(generate<T>(pos, mlist)) {}
void operator++() { cur++; }
Move operator*() const { return cur->move; }
bool end() const { return cur == last; }
Move move() const { return cur->move; }
size_t size() const { return last - mlist; }
bool contains(Move m) const {
for (const MoveStack* it(mlist); it != last; ++it) if (it->move == m) return true;

6
src/notation.cpp
View file

@ -89,9 +89,9 @@ Move move_from_uci(const Position& pos, string& str) {
if (str.length() == 5) // Junior could send promotion piece in uppercase
str[4] = char(tolower(str[4]));
for (MoveList<LEGAL> ml(pos); !ml.end(); ++ml)
if (str == move_to_uci(ml.move(), pos.is_chess960()))
return ml.move();
for (MoveList<LEGAL> it(pos); !it.end(); ++it)
if (str == move_to_uci(*it, pos.is_chess960()))
return *it;
return MOVE_NONE;
}

4
src/position.cpp
View file

@ -408,8 +408,8 @@ const string Position::pretty(Move move) const {
ss << square_to_string(pop_lsb(&b)) << " ";
ss << "\nLegal moves: ";
for (MoveList<LEGAL> ml(*this); !ml.end(); ++ml)
ss << move_to_san(*const_cast<Position*>(this), ml.move()) << " ";
for (MoveList<LEGAL> it(*this); !it.end(); ++it)
ss << move_to_san(*const_cast<Position*>(this), *it) << " ";
return ss.str();
}

6
src/search.cpp
View file

@ -163,11 +163,11 @@ size_t Search::perft(Position& pos, Depth depth) {
size_t cnt = 0;
CheckInfo ci(pos);
for (MoveList<LEGAL> ml(pos); !ml.end(); ++ml)
for (MoveList<LEGAL> it(pos); !it.end(); ++it)
{
pos.do_move(ml.move(), st, ci, pos.move_gives_check(ml.move(), ci));
pos.do_move(*it, st, ci, pos.move_gives_check(*it, ci));
cnt += perft(pos, depth - ONE_PLY);
pos.undo_move(ml.move());
pos.undo_move(*it);
}
return cnt;

6
src/thread.cpp
View file

@ -371,10 +371,10 @@ void ThreadPool::start_thinking(const Position& pos, const LimitsType& limits,
SetupStates = states; // Ownership transfer here
RootMoves.clear();
for (MoveList<LEGAL> ml(pos); !ml.end(); ++ml)
for (MoveList<LEGAL> it(pos); !it.end(); ++it)
if ( searchMoves.empty()
|| std::count(searchMoves.begin(), searchMoves.end(), ml.move()))
RootMoves.push_back(RootMove(ml.move()));
|| std::count(searchMoves.begin(), searchMoves.end(), *it))
RootMoves.push_back(RootMove(*it));
main_thread()->thinking = true;
main_thread()->notify_one(); // Starts main thread