kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-30 16:53:09 +00:00
Code Issues Releases Wiki Activity

Retire move_ambiguity() altogether

Browse source 
No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2011-03-23 10:50:50 +01:00
parent d52d91064f
commit 87ca13a79a
1 changed files with 37 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

111
src/move.cpp
View file

@ -17,11 +17,6 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
////
//// Includes
////
#include <cassert> #include <cassert>
#include <cstring> #include <cstring>
#include <iomanip> #include <iomanip>
@ -34,36 +29,22 @@
using std::string; using std::string;
////
//// Local definitions
////
namespace { namespace {
enum Ambiguity {
AMBIGUITY_NONE, AMBIGUITY_FILE, AMBIGUITY_RANK, AMBIGUITY_BOTH
};
Ambiguity move_ambiguity(const Position& pos, Move m);
const string time_string(int milliseconds); const string time_string(int milliseconds);
const string score_string(Value v); const string score_string(Value v);
} }
////
//// Functions
////
/// move_to_uci() converts a move to a string in coordinate notation /// move_to_uci() converts a move to a string in coordinate notation
/// (g1f3, a7a8q, etc.). The only special case is castling moves, where we /// (g1f3, a7a8q, etc.). The only special case is castling moves, where we
/// print in the e1g1 notation in normal chess mode, and in e1h1 notation in /// print in the e1g1 notation in normal chess mode, and in e1h1 notation in
/// Chess960 mode. /// Chess960 mode.
const std::string move_to_uci(Move m, bool chess960) { const string move_to_uci(Move m, bool chess960) {
std::string promotion;
Square from = move_from(m); Square from = move_from(m);
Square to = move_to(m); Square to = move_to(m);
string promotion;
if (m == MOVE_NONE) if (m == MOVE_NONE)
return "(none)"; return "(none)";
@ -87,7 +68,7 @@ const std::string move_to_uci(Move m, bool chess960) {
/// move_from_uci() takes a position and a string representing a move in /// move_from_uci() takes a position and a string representing a move in
/// simple coordinate notation and returns an equivalent Move. /// simple coordinate notation and returns an equivalent Move.
Move move_from_uci(const Position& pos, const std::string& str) { Move move_from_uci(const Position& pos, const string& str) {
MoveStack mlist[MOVES_MAX]; MoveStack mlist[MOVES_MAX];
MoveStack* last = generate<MV_LEGAL>(pos, mlist); MoveStack* last = generate<MV_LEGAL>(pos, mlist);
@ -109,10 +90,11 @@ const string move_to_san(Position& pos, Move m) {
assert(pos.is_ok()); assert(pos.is_ok());
assert(move_is_ok(m)); assert(move_is_ok(m));
string san; MoveStack mlist[MOVES_MAX];
Square from = move_from(m); Square from = move_from(m);
Square to = move_to(m); Square to = move_to(m);
PieceType pt = type_of_piece(pos.piece_on(from)); PieceType pt = pos.type_of_piece_on(from);
string san;
if (m == MOVE_NONE) if (m == MOVE_NONE)
return "(none)"; return "(none)";
@ -128,23 +110,32 @@ const string move_to_san(Position& pos, Move m) {
{ {
if (pt != PAWN) if (pt != PAWN)
{ {
san += piece_type_to_char(pt); san = piece_type_to_char(pt);
switch (move_ambiguity(pos, m)) { // Collect all legal moves of piece type 'pt' with destination 'to'
case AMBIGUITY_NONE: MoveStack* last = generate<MV_LEGAL>(pos, mlist);
break; int f = 0, r = 0;
case AMBIGUITY_FILE:
san += file_to_char(square_file(from)); for (MoveStack* cur = mlist; cur != last; cur++)
break; if ( move_to(cur->move) == to
case AMBIGUITY_RANK: && pos.type_of_piece_on(move_from(cur->move)) == pt)
san += rank_to_char(square_rank(from)); {
break; if (square_file(move_from(cur->move)) == square_file(from))
case AMBIGUITY_BOTH: f++;
san += square_to_string(from);
break; if (square_rank(move_from(cur->move)) == square_rank(from))
default: r++;
assert(false); }
}
assert(f > 0 && r > 0);
// Disambiguation if we have more then one piece with destination 'to'
if (f == 1 && r > 1)
san += file_to_char(square_file(from));
else if (f > 1 && r == 1)
san += rank_to_char(square_rank(from));
else if (f > 1 && r > 1)
san += square_to_string(from);
} }
if (pos.move_is_capture(m)) if (pos.move_is_capture(m))
@ -154,6 +145,7 @@ const string move_to_san(Position& pos, Move m) {
san += 'x'; san += 'x';
} }
san += square_to_string(to); san += square_to_string(to);
if (move_is_promotion(m)) if (move_is_promotion(m))
@ -163,8 +155,8 @@ const string move_to_san(Position& pos, Move m) {
} }
} }
// The move gives check ? We don't use pos.move_is_check() here // The move gives check? We don't use pos.move_is_check() here
// because we need to test for mate after the move is done. // because we need to test for a mate after the move is done.
StateInfo st; StateInfo st;
pos.do_move(m, st); pos.do_move(m, st);
if (pos.is_check()) if (pos.is_check())
@ -189,8 +181,8 @@ const string pretty_pv(Position& pos, int depth, Value score, int time, Move pv[
StateInfo state[PLY_MAX_PLUS_2], *st = state; StateInfo state[PLY_MAX_PLUS_2], *st = state;
Move* m = pv; Move* m = pv;
std::stringstream s;
string san; string san;
std::stringstream s;
size_t length = 0; size_t length = 0;
// First print depth, score, time and searched nodes... // First print depth, score, time and searched nodes...
@ -201,9 +193,9 @@ const string pretty_pv(Position& pos, int depth, Value score, int time, Move pv[
if (pos.nodes_searched() < M) if (pos.nodes_searched() < M)
s << std::setw(8) << pos.nodes_searched() / 1 << " "; s << std::setw(8) << pos.nodes_searched() / 1 << " ";
else if (pos.nodes_searched() < K * M) else if (pos.nodes_searched() < K * M)
s << std::setw(7) << pos.nodes_searched() / K << " K "; s << std::setw(7) << pos.nodes_searched() / K << "K ";
else else
s << std::setw(7) << pos.nodes_searched() / M << " M "; s << std::setw(7) << pos.nodes_searched() / M << "M ";
// ...then print the full PV line in short algebraic notation // ...then print the full PV line in short algebraic notation
while (*m != MOVE_NONE) while (*m != MOVE_NONE)
@ -230,35 +222,6 @@ const string pretty_pv(Position& pos, int depth, Value score, int time, Move pv[
namespace { namespace {
Ambiguity move_ambiguity(const Position& pos, Move m) {
MoveStack mlist[MOVES_MAX];
Piece pc = pos.piece_on(move_from(m));
int f = 0, r = 0;
MoveStack* last = generate<MV_LEGAL>(pos, mlist);
// Collect all legal moves of piece 'pc' with destination 'to'
for (MoveStack* cur = mlist; cur != last; cur++)
{
if ( move_to(cur->move) == move_to(m)
&& pos.piece_on(move_from(cur->move)) == pc)
{
if (square_file(move_from(cur->move)) == square_file(move_from(m)))
f++;
if (square_rank(move_from(cur->move)) == square_rank(move_from(m)))
r++;
}
}
assert(f > 0 && r > 0);
return f == 1 ? (r == 1 ? AMBIGUITY_NONE : AMBIGUITY_FILE)
: (r == 1 ? AMBIGUITY_RANK : AMBIGUITY_BOTH);
}
const string time_string(int millisecs) { const string time_string(int millisecs) {
const int MSecMinute = 1000 * 60; const int MSecMinute = 1000 * 60;