Permalink
Browse files

Some minor cleanup stuff

I came across while browsing the code.

No functional change.
  • Loading branch information...
1 parent bbd69c0 commit 553ead429d94b6314ff14aa3eb724f47987e5a52 mstembera committed with Mar 3, 2014
Showing with 11 additions and 19 deletions.
  1. +8 −8 src/evaluate.cpp
  2. +3 −10 src/search.cpp
  3. +0 −1 src/tt.h
View
@@ -494,16 +494,16 @@ Value do_evaluate(const Position& pos) {
if (ei.attackedBy[Them][PAWN] & s)
score -= ThreatenedByPawn[Pt];
- // Penalty for bishop with same coloured pawns
- if (Pt == BISHOP)
- score -= BishopPawns * ei.pi->pawns_on_same_color_squares(Us, s);
-
- // Penalty for knight when there are few enemy pawns
- if (Pt == KNIGHT)
- score -= KnightPawns * std::max(5 - pos.count<PAWN>(Them), 0);
-
if (Pt == BISHOP || Pt == KNIGHT)
{
+ // Penalty for bishop with same colored pawns
+ if (Pt == BISHOP)
+ score -= BishopPawns * ei.pi->pawns_on_same_color_squares(Us, s);
+
+ // Penalty for knight when there are few enemy pawns
+ if (Pt == KNIGHT)
+ score -= KnightPawns * std::max(5 - pos.count<PAWN>(Them), 0);
+
// Bishop and knight outposts squares
if (!(pos.pieces(Them, PAWN) & pawn_attack_span(Us, s)))
score += evaluate_outposts<Pt, Us>(pos, ei, s);
View
@@ -391,8 +391,6 @@ namespace {
sync_cout << uci_pv(pos, depth, alpha, beta) << sync_endl;
}
- Time::point iterationTime = Time::now() - SearchTime;
-
// If skill levels are enabled and time is up, pick a sub-optimal best move
if (skill.enabled() && skill.time_to_pick(depth))
skill.pick_move();
@@ -417,19 +415,14 @@ namespace {
// Do we have time for the next iteration? Can we stop searching now?
if (Limits.use_time_management() && !Signals.stop && !Signals.stopOnPonderhit)
{
- bool stop = false; // Local variable, not the volatile Signals.stop
-
// Take some extra time if the best move has changed
if (depth > 4 && depth < 50 && MultiPV == 1)
TimeMgr.pv_instability(BestMoveChanges);
// Stop the search if only one legal move is available or all
// of the available time has been used.
if ( RootMoves.size() == 1
- || iterationTime > TimeMgr.available_time() )
- stop = true;
-
- if (stop)
+ || Time::now() - SearchTime > TimeMgr.available_time())
{
// If we are allowed to ponder do not stop the search now but
// keep pondering until the GUI sends "ponderhit" or "stop".
@@ -663,7 +656,7 @@ namespace {
&& abs(beta) < VALUE_MATE_IN_MAX_PLY)
{
Value rbeta = std::min(beta + 200, VALUE_INFINITE);
- Depth rdepth = depth - ONE_PLY - 3 * ONE_PLY;
+ Depth rdepth = depth - 4 * ONE_PLY;
assert(rdepth >= ONE_PLY);
assert((ss-1)->currentMove != MOVE_NONE);
@@ -1016,7 +1009,7 @@ namespace {
// case of Signals.stop or thread.cutoff_occurred() are set, but this is
// harmless because return value is discarded anyhow in the parent nodes.
// If we are in a singular extension search then return a fail low score.
- // A split node has at least one move - the one tried before to be splitted.
+ // A split node has at least one move - the one tried before to be split.
if (!moveCount)
return excludedMove ? alpha
: inCheck ? mated_in(ss->ply) : DrawValue[pos.side_to_move()];
View
@@ -32,7 +32,6 @@
/// value: 16 bit
/// depth: 16 bit
/// static value: 16 bit
-/// static margin: 16 bit
struct TTEntry {

0 comments on commit 553ead4

Please sign in to comment.