Use MVV/LVA in score_evasions()

Signed-off-by: Marco Costalba <mcostalba@gmail.com>

diff --git a/src/movepick.cpp b/src/movepick.cpp
index c71572e7cf86bead8aa853dd16db512ab329e55d..59855dba66a56d0ab808f3f75bfce778aca4ee23 100644 (file)
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -251,21 +251,26 @@ void MovePicker::score_noncaptures() {
   }
 }
 
-void MovePicker::score_evasions() {
-
-  for (int i = 0; i < numOfMoves; i++)
-  {
-      Move m = moves[i].move;
-      if (m == ttMove)
-          moves[i].score = 2*HistoryMax;
-      else if (!pos.square_is_empty(move_to(m)))
-      {
-          int seeScore = pos.see(m);
-          moves[i].score = (seeScore >= 0)? seeScore + HistoryMax : seeScore;
-      } else
-          moves[i].score = H.move_ordering_score(pos.piece_on(move_from(m)), m);
-  }
-  // FIXME try psqt also here
+void MovePicker::score_evasions() {\r
+\r
+  Move m;\r
+  int hs;\r
+\r
+  // Use MVV/LVA ordering\r
+   for (int i = 0; i < numOfMoves; i++)\r
+   {\r
+      m = moves[i].move;\r
+\r
+       if (m == ttMove)\r
+          hs = 2*HistoryMax;\r
+       else if (!pos.square_is_empty(move_to(m)))\r
+          hs = int(pos.midgame_value_of_piece_on(move_to(m)))\r
+              -int(pos.type_of_piece_on(move_from(m))) + HistoryMax;\r
+      else\r
+          hs = H.move_ordering_score(pos.piece_on(move_from(m)), m);\r
+\r
+      moves[i].score = hs;\r
+  }\r
 }
 
 void MovePicker::score_qcaptures() {