remove mvv-lva

Author: andtsa

src/engine/move_generation/mod.rs

@@ -9,7 +9,6 @@ use chess::Board;
 use chess::ChessMove;
 use chess::EMPTY;
 use chess::MoveGen;
-use heuristics::mvv_lva_score;
 
 use crate::evaluation::bitboards::CENTER_4;
 use crate::evaluation::bitboards::CENTER_16;
@@ -45,18 +44,18 @@ pub fn prio_iterator(mut mgen: MoveGen, pos: &Board, prio: &[ChessMove]) -> Orde
         !EMPTY,
     ];
 
-    // collect capture moves and sort by mvv-lva
-    mgen.set_iterator_mask(*pos.color_combined(!pos.side_to_move()));
-
-    let mut prio_moves: Vec<ChessMove> = mgen.by_ref().collect();
-    prio_moves.sort_by_cached_key(|mv| mvv_lva_score(pos, mv));
-
-    prio_moves.extend_from_slice(prio);
+    // // collect capture moves and sort by mvv-lva
+    // mgen.set_iterator_mask(*pos.color_combined(!pos.side_to_move()));
+    //
+    // let mut prio_moves: Vec<ChessMove> = mgen.by_ref().collect();
+    // prio_moves.sort_by_cached_key(|mv| mvv_lva_score(pos, mv));
+    //
+    // prio_moves.extend_from_slice(prio);
 
     mgen.set_iterator_mask(masks[0]);
 
     OrderedMoves {
-        prio_moves,
+        prio_moves: prio.to_vec(),
         mgen,
         masks,
         cur_mask: 0,

src/engine/search/negamax.rs

@@ -96,14 +96,6 @@ pub fn negamax(
     opts: &Opts,
     table: &ShareImpl,
 ) -> SearchResult {
-    // the initial move generator
-    let mut base_gen = MoveGen::new_legal(&pos.chessboard);
-    // slice for already generated moves.
-    let mut pre_generated: [Option<ChessMove>; 4] = [None; 4];
-
-    // we are mated!
-    let out_of_moves = base_gen.len() == 0;
-
     optlog!(search;trace;"ng: {pos}, td: {to_depth:?}, a: {alpha:?}, b: {beta:?}");
 
     let current_hash = pos.chessboard.get_hash();
@@ -125,6 +117,14 @@ pub fn negamax(
         };
     }
 
+    // the initial move generator
+    let mut base_gen = MoveGen::new_legal(&pos.chessboard);
+    // slice for already generated moves.
+    let mut pre_generated: [Option<ChessMove>; 4] = [None; 4];
+
+    // we are mated!
+    let out_of_moves = base_gen.len() == 0;
+
     /* source: https://en.wikipedia.org/wiki/Negamax */
     let alpha_orig = alpha;
     if opts.use_tt {