Manual merge

[stockfish] / src / movepick.cpp

diff --git a/src/movepick.cpp b/src/movepick.cpp
index b115e8ffb1a9c3b9a6a1c6371ffef62067eea3e3..187a3c513e0275a112c377919a40d62cbdebf586 100644 (file)
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -8,6 +8,7 @@
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 

+

   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
   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


@@ -233,25 +234,25 @@ void MovePicker::score_noncaptures() {
   // First score by history, when no history is available then use
   // piece/square tables values. This seems to be better then a
   // random choice when we don't have an history for any move.
   // First score by history, when no history is available then use
   // piece/square tables values. This seems to be better then a
   // random choice when we don't have an history for any move.

-  Move m;\r
-  int hs;\r
-\r
-  for (int i = 0; i < numOfMoves; i++)\r
-  {\r
-      m = moves[i].move;\r
-\r
-      if (m == killer1)\r
-          hs = HistoryMax + 2;\r
-      else if (m == killer2)\r
-          hs = HistoryMax + 1;\r
-      else\r
-          hs = H.move_ordering_score(pos.piece_on(move_from(m)), m);\r
-\r
-      // Ensure moves in history are always sorted as first\r
-      if (hs > 0)\r
-          hs += 1000;\r
-\r
-      moves[i].score = hs + pos.mg_pst_delta(m);\r
+  Move m;
+  int hs;
+
+  for (int i = 0; i < numOfMoves; i++)
+  {
+      m = moves[i].move;
+
+      if (m == killer1)
+          hs = HistoryMax + 2;
+      else if (m == killer2)
+          hs = HistoryMax + 1;
+      else
+          hs = H.move_ordering_score(pos.piece_on(move_from(m)), m);
+
+      // Ensure moves in history are always sorted as first
+      if (hs > 0)
+          hs += 1000;
+
+      moves[i].score = hs + pos.mg_pst_delta(m);

   }
 }
 
   }
 }