Always add psqt scoring

[stockfish] / src / movepick.cpp

diff --git a/src/movepick.cpp b/src/movepick.cpp
index 4d2d31167ea2db2641c582c545ba3c6c46b1a0fe..361644af20bf9c18be7bdd45583e969416306012 100644 (file)
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -246,14 +246,21 @@ void MovePicker::score_captures() {
 }
 
 void MovePicker::score_noncaptures() {
-  for(int i = 0; i < numOfMoves; i++) {
-    Move m = moves[i].move;
-    if(m == killer1)
-      moves[i].score = HistoryMax + 2;
-    else if(m == killer2)
-      moves[i].score = HistoryMax + 1;
-    else
-      moves[i].score = H.move_ordering_score(pos->piece_on(move_from(m)), m);
+
+  for (int i = 0; i < numOfMoves; i++)
+  {
+      Move m = moves[i].move;
+      if (m == killer1)
+          moves[i].score = HistoryMax + 2;
+      else if (m == killer2)
+          moves[i].score = HistoryMax + 1;
+      else
+          moves[i].score = H.move_ordering_score(pos->piece_on(move_from(m)), m);
+
+      if (moves[i].score > 0)
+          moves[i].score += 1000;
+
+      moves[i].score += pos->mg_pst_delta(moves[i].move);
   }
 }