X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovepick.cpp;h=e1f8e4e77f944bd5831245b81dd16c467c9935f0;hb=af59cb1d63234fe5c711f4a0dc28d56fe79d1274;hp=9a389c6b6b4f211cb24eb94774f40995dc45749a;hpb=cf8ee79b767771bfb9c0ad06de1362400ea0ee5d;p=stockfish

diff --git a/src/movepick.cpp b/src/movepick.cpp
index 9a389c6b..e1f8e4e7 100644
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -1,13 +1,14 @@
 /*
-  Glaurung, a UCI chess playing engine.
-  Copyright (C) 2004-2008 Tord Romstad
+  Stockfish, a UCI chess playing engine derived from Glaurung 2.1
+  Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
+  Copyright (C) 2008 Marco Costalba
 
-  Glaurung is free software: you can redistribute it and/or modify
+  Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   
-  Glaurung is distributed in the hope that it will be useful,
+  Stockfish is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
@@ -99,7 +100,7 @@ Move MovePicker::get_next_move() {
   while (true)
   {
     // If we already have a list of generated moves, pick the best move from
-    // the list, and return it:
+    // the list, and return it.
     move = pick_move_from_list();
     if (move != MOVE_NONE)
     {
@@ -107,7 +108,7 @@ Move MovePicker::get_next_move() {
         return move;
     }
 
-    // Next phase:
+    // Next phase
     phaseIndex++;
     switch (PhaseTable[phaseIndex]) {
 
@@ -199,8 +200,7 @@ Move MovePicker::get_next_move(Lock &lock) {
 /// MovePicker::score_captures(), MovePicker::score_noncaptures(),
 /// MovePicker::score_evasions() and MovePicker::score_qcaptures() assign a
 /// numerical move ordering score to each move in a move list.  The moves
-/// with highest scores will be picked first by
-/// MovePicker::pick_move_from_list().
+/// with highest scores will be picked first by pick_move_from_list().
 
 void MovePicker::score_captures() {
   // Winning and equal captures in the main search are ordered by MVV.
@@ -216,9 +216,9 @@ void MovePicker::score_captures() {
   {
       Move m = moves[i].move;
       moves[i].score = pos.see(m);
-      //if (moves[i].score >= 0)
-      //    moves[i].score = move_promotion(m) ? QueenValueMidgame
-      //                   : pos.midgame_value_of_piece_on(move_to(m));
+      if (moves[i].score >= 0)
+          moves[i].score = move_promotion(m) ? QueenValueMidgame
+                         : pos.midgame_value_of_piece_on(move_to(m));
   }
 }
 
@@ -321,7 +321,7 @@ Move MovePicker::pick_move_from_list() {
                   badCaptures[numOfBadCaptures++] = moves[i];
                   moves[i--] = moves[--numOfMoves];
                }
-               else if (moves[i].score > bestScore) // FIXME >= 0 ??
+               else if (moves[i].score > bestScore)
                {
                    bestIndex = i;
                    bestScore = moves[i].score;
@@ -348,7 +348,7 @@ Move MovePicker::pick_move_from_list() {
           // the entire move list for the best move.  If many moves have already
           // been searched and it is not a PV node, we are probably failing low
           // anyway, so we just pick the first move from the list.
-          bestIndex = (pvNode || movesPicked < 12 ? find_best_index() : movesPicked);
+          bestIndex = (movesPicked < 12 || pvNode ? find_best_index() : movesPicked);
 
           if (bestIndex != -1)
           {
@@ -435,6 +435,7 @@ Move MovePicker::pick_move_from_list() {
 /// picked next move. It can be used in search to further differentiate
 /// according to the current move type: capture, non capture, escape, etc.
 MovePicker::MovegenPhase MovePicker::current_move_type() const {
+
   return PhaseTable[phaseIndex];
 }