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

Simplify move_ambiguity()

Browse source 
And additional small touches in move.cpp

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2011-03-22 09:24:14 +01:00
parent 920b1abede
commit d52d91064f
1 changed files with 22 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/move.cpp
View file

@ -232,36 +232,30 @@ namespace {
Ambiguity move_ambiguity(const Position& pos, Move m) { Ambiguity move_ambiguity(const Position& pos, Move m) {
MoveStack mlist[MOVES_MAX], *last; MoveStack mlist[MOVES_MAX];
Move candidates[8]; Piece pc = pos.piece_on(move_from(m));
Square from = move_from(m); int f = 0, r = 0;
Square to = move_to(m);
Piece pc = pos.piece_on(from);
int matches = 0, f = 0, r = 0;
// If there is only one piece 'pc' then move cannot be ambiguous MoveStack* last = generate<MV_LEGAL>(pos, mlist);
if (pos.piece_count(pos.side_to_move(), type_of_piece(pc)) == 1)
return AMBIGUITY_NONE;
// Collect all legal moves of piece 'pc' with destination 'to' // Collect all legal moves of piece 'pc' with destination 'to'
last = generate<MV_LEGAL>(pos, mlist);
for (MoveStack* cur = mlist; cur != last; cur++) for (MoveStack* cur = mlist; cur != last; cur++)
if (move_to(cur->move) == to && pos.piece_on(move_from(cur->move)) == pc)
candidates[matches++] = cur->move;
if (matches == 1)
return AMBIGUITY_NONE;
for (int i = 0; i < matches; i++)
{ {
if (square_file(move_from(candidates[i])) == square_file(from)) 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++; f++;
if (square_rank(move_from(candidates[i])) == square_rank(from)) if (square_rank(move_from(cur->move)) == square_rank(move_from(m)))
r++; r++;
} }
}
return f == 1 ? AMBIGUITY_FILE : r == 1 ? AMBIGUITY_RANK : AMBIGUITY_BOTH; assert(f > 0 && r > 0);
return f == 1 ? (r == 1 ? AMBIGUITY_NONE : AMBIGUITY_FILE)
: (r == 1 ? AMBIGUITY_RANK : AMBIGUITY_BOTH);
} }
@ -270,17 +264,16 @@ namespace {
const int MSecMinute = 1000 * 60; const int MSecMinute = 1000 * 60;
const int MSecHour = 1000 * 60 * 60; const int MSecHour = 1000 * 60 * 60;
std::stringstream s;
s << std::setfill('0');
int hours = millisecs / MSecHour; int hours = millisecs / MSecHour;
int minutes = (millisecs - hours * MSecHour) / MSecMinute; int minutes = (millisecs % MSecHour) / MSecMinute;
int seconds = (millisecs - hours * MSecHour - minutes * MSecMinute) / 1000; int seconds = ((millisecs % MSecHour) % MSecMinute) / 1000;
std::stringstream s;
if (hours) if (hours)
s << hours << ':'; s << hours << ':';
s << std::setw(2) << minutes << ':' << std::setw(2) << seconds; s << std::setfill('0') << std::setw(2) << minutes << ':' << std::setw(2) << seconds;
return s.str(); return s.str();
} }
@ -294,13 +287,8 @@ namespace {
else if (v <= -VALUE_MATE + 200) else if (v <= -VALUE_MATE + 200)
s << "-#" << (VALUE_MATE + v) / 2; s << "-#" << (VALUE_MATE + v) / 2;
else else
{ s << std::setprecision(2) << std::fixed << std::showpos << float(v) / PawnValueMidgame;
float floatScore = float(v) / float(PawnValueMidgame);
if (v >= 0)
s << '+';
s << std::setprecision(2) << std::fixed << floatScore;
}
return s.str(); return s.str();
} }
} }