MovePicker: retire per square MVV/LVA ordering

Is not used anyway and in case we need it again we
can resurrect from git archives.

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

diff --git a/src/movepick.cpp b/src/movepick.cpp
index fb218f3d6c26a7a52bdc43744f4d8a5365026ff6..280a61a1117bea419091c05223e1a053d6efc5cd 100644 (file)
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -300,16 +300,14 @@ void MovePicker::score_qcaptures() {
 
 
 /// find_best_index() loops across the moves and returns index of
 
 
 /// find_best_index() loops across the moves and returns index of

-/// the highest scored one. There is also a second version that
-/// lowers the priority of moves that attack the same square,
-/// so that if the best move that attack a square fails the next
-/// move picked attacks a different square if any, not the same one.
+/// the highest scored one.

 
 

-int MovePicker::find_best_index() {
+int MovePicker::find_best_index() const {

 
   assert(movesPicked < numOfMoves);
 
 
   assert(movesPicked < numOfMoves);
 

-  int bestIndex = movesPicked, bestScore = moves[movesPicked].score;
+  int bestIndex = movesPicked;
+  int bestScore = moves[movesPicked].score;

 
   for (int i = movesPicked + 1; i < numOfMoves; i++)
       if (moves[i].score > bestScore)
 
   for (int i = movesPicked + 1; i < numOfMoves; i++)
       if (moves[i].score > bestScore)


@@ -320,45 +318,6 @@ int MovePicker::find_best_index() {
   return bestIndex;
 }
 
   return bestIndex;
 }
 

-int MovePicker::find_best_index(Bitboard* squares, int values[]) {
-
-  assert(movesPicked < numOfMoves);
-
-  int hs;
-  Move m;
-  Square to;
-  int bestScore = -10000000, bestIndex = -1;
-
-  for (int i = movesPicked; i < numOfMoves; i++)
-  {
-      m = moves[i].move;
-      to = move_to(m);
-
-      if (!bit_is_set(*squares, to))
-      {
-          // Init at first use
-          set_bit(squares, to);
-          values[to] = 0;
-      }
-
-      hs = moves[i].score - values[to];
-      if (hs > bestScore)
-      {
-          bestIndex = i;
-          bestScore = hs;
-      }
-  }
-
-  if (bestIndex != -1)
-  {
-      // Raise value of the picked square, so next attack
-      // to the same square will get low priority.
-      to = move_to(moves[bestIndex].move);
-      values[to] += 0xB00;
-  }
-  return bestIndex;
-}
-

 
 /// MovePicker::pick_move_from_list() picks the move with the biggest score
 /// from a list of generated moves (moves[] or badCaptures[], depending on
 
 /// MovePicker::pick_move_from_list() picks the move with the biggest score
 /// from a list of generated moves (moves[] or badCaptures[], depending on


@@ -510,5 +469,4 @@ void MovePicker::init_phase_table() {
   PhaseTable[i++] = PH_TT_MOVE;
   PhaseTable[i++] = PH_QCAPTURES;
   PhaseTable[i++] = PH_STOP;
   PhaseTable[i++] = PH_TT_MOVE;
   PhaseTable[i++] = PH_QCAPTURES;
   PhaseTable[i++] = PH_STOP;

-

 }
 }

diff --git a/src/movepick.h b/src/movepick.h
index 4ae40685a86e9811061fb6eec5ea5e4104857107..1c8d0d30fa08a629b4986cbba8708e5a3debe9c1 100644 (file)
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -80,8 +80,7 @@ private:
   void score_evasions();
   void score_qcaptures();
   Move pick_move_from_list();
   void score_evasions();
   void score_qcaptures();
   Move pick_move_from_list();

-  int find_best_index();
-  int find_best_index(Bitboard* squares, int values[]);
+  int find_best_index() const;

 
   const Position& pos;
   Move ttMove, mateKiller, killer1, killer2;
 
   const Position& pos;
   Move ttMove, mateKiller, killer1, killer2;