}
}
-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() {