Merge branch 'main' of github.com:LelleSwe/chess-algorithm-development into LelleSwe/main

confusinguser · confusinguser · commit 1f4f5cd82a57 · 2024-02-11T15:29:10.000+01:00
diff --git a/src/algorithms/the_algorithm.rs b/src/algorithms/the_algorithm.rs
@@ -69,12 +69,7 @@ impl Algorithm {
                 stats.time_for_transposition_access += Instant::now() - start;
                 stats.transposition_table_entries += 1
             }
-            return Evaluation::new(
-                Some(eval + incremental_psqt_eval),
-                None,
-                None,
-                Some(incremental_psqt_eval),
-            );
+            return Evaluation::new(Some(eval), None, None, Some(incremental_psqt_eval));
         }
 
         // Whether we should try to maximise the eval
@@ -255,7 +250,6 @@ impl Algorithm {
                             - 2 * piece_value(Piece::King)) as f32
                             * TAPERED_EG_PESTO[piece_type.to_index()][location]
                 }
-
                 let moved_piece_type = board.piece_on(chess_move.get_source()).unwrap();
 
                 let multiplier = if board.side_to_move() == Color::White {
@@ -418,10 +412,10 @@ impl Algorithm {
             // This is third time this is played. Draw by three-fold repetition
             return 0.;
         }
-        let material_each_side = utils::material_each_side(board);
+        let material_each_side: (u32, u32) = utils::material_each_side(board);
 
         // Negative when black has advantage
-        let diff_material = material_each_side.0 as i32 - material_each_side.1 as i32;
+        let diff_material: i32 = material_each_side.0 as i32 - material_each_side.1 as i32;
 
         let mut controlled_squares = 0;
         if utils::module_enabled(self.modules, modules::SQUARE_CONTROL_METRIC) {
@@ -513,10 +507,10 @@ impl Algorithm {
                 let mut bonus: f32 = 0.;
                 let pawn_bitboard: usize = (all_pawn_bitboard & color_bitboard).to_size(0);
                 let king_bitboard: usize = (all_king_bitboard & color_bitboard).to_size(0);
-                //pawn chain, awarding 0.5 eval for each pawn protected by another pawn.
+                //pawn chain, awarding 0.5 eval for each pawn protected by another pawn. Constants should in theory cover an (literal) edge case... I hope.
                 bonus += 0.5
-                    * ((pawn_bitboard & (pawn_bitboard << 7)).count_ones()
-                        + (pawn_bitboard & (pawn_bitboard << 9)).count_ones())
+                    * ((pawn_bitboard & (0xFEFEFEFEFEFEFEFE & pawn_bitboard << 7)).count_ones()
+                        + (pawn_bitboard & (0x7F7F7F7F7F7F7F7F & pawn_bitboard << 9)).count_ones())
                         as f32;
 
                 //stacked pawns. -0.5 points per rank containing >1 pawns. By taking the pawn bitboard and operating bitwise AND for another bitboard (integer) where the leftmost rank is filled. This returns all pawns in that rank. By bitshifting we can choose rank. Additionally by counting we get number of pawns. We then remove 1 as we only want to know if there are >1 pawn. If there is, subtract 0.5 points per extra pawn.
diff --git a/src/common/constants.rs b/src/common/constants.rs
@@ -163,56 +163,73 @@ pub(crate) mod tapered_pesto_psqt_tables {
         ],
     ];
 
+    #[rustfmt::skip]
     pub(crate) const TAPERED_EG_PESTO: [[f32; 64]; 6] = [
         //Pawn
         [
-            0., 0., 0., 0., 0., 0., 0., 0., 1.78, 1.73, 1.58, 1.34, 1.47, 1.32, 1.65, 1.87, 0.94,
-            1., 0.85, 0.67, 0.56, 0.53, 0.82, 0.84, 0.32, 0.24, 0.13, 0.05, -0.02, 0.04, 0.17,
-            0.17, 0.13, 0.09, -0.03, -0.07, -0.07, -0.08, 0.03, -0.01, 0.04, 0.07, -0.06, 0.01, 0.,
-            -0.05, -0.01, -0.08, 0.13, 0.08, 0.08, 0.10, 0.13, 0., 0.02, -0.07, 0., 0., 0., 0., 0.,
-            0., 0., 0.,
+            0., 0., 0., 0., 0., 0., 0., 0.,
+            1.78, 1.73, 1.58, 1.34, 1.47, 1.32, 1.65, 1.87,
+            0.94, 1., 0.85, 0.67, 0.56, 0.53, 0.82, 0.84,
+            0.32, 0.24, 0.13, 0.05, -0.02, 0.04, 0.17, 0.17,
+            0.13, 0.09, -0.03, -0.07, -0.07, -0.08, 0.03, -0.01,
+            0.04, 0.07, -0.06, 0.01, 0., -0.05, -0.01, -0.08,
+            0.13, 0.08, 0.08, 0.10, 0.13, 0., 0.02, -0.07,
+            0., 0., 0., 0., 0., 0., 0., 0.,
         ],
         //Knight
         [
-            -0.58, -0.38, -0.13, -0.28, -0.31, -0.27, -0.63, -0.99, -0.25, -0.08, -0.25, -0.02,
-            -0.09, -0.25, -0.24, -0.52, -0.24, -0.20, 0.10, 0.09, -0.01, -0.09, -0.19, -0.41,
-            -0.17, 0.03, 0.22, 0.22, 0.22, 0.11, 0.08, -0.18, -0.18, -0.06, 0.16, 0.25, 0.16, 0.17,
-            0.04, -0.18, -0.23, -0.03, -0.01, 0.15, 0.10, -0.03, -0.20, -0.22, -0.42, -0.20, -0.10,
-            -0.05, -0.02, -0.20, -0.23, -0.44, -0.29, -0.51, -0.23, -0.15, -0.22, -0.18, -0.50,
-            -0.64,
+            -0.58, -0.38, -0.13, -0.28, -0.31, -0.27, -0.63, -0.99,
+            -0.25, -0.08, -0.25, -0.02, -0.09, -0.25, -0.24, -0.52,
+            -0.24, -0.20, 0.10, 0.09, -0.01, -0.09, -0.19, -0.41,
+            -0.17, 0.03, 0.22, 0.22, 0.22, 0.11, 0.08, -0.18,
+            -0.18, -0.06, 0.16, 0.25, 0.16, 0.17, 0.04, -0.18,
+            -0.23, -0.03, -0.01, 0.15, 0.10, -0.03, -0.20, -0.22,
+            -0.42, -0.20, -0.10, -0.05, -0.02, -0.20, -0.23, -0.44,
+            -0.29, -0.51, -0.23, -0.15, -0.22, -0.18, -0.50, -0.64,
         ],
         //Bishop
         [
-            -0.14, -0.21, -0.11, -0.08, -0.07, -0.09, -0.17, -0.24, -0.08, -0.04, 0.07, -0.12,
-            -0.03, -0.13, -0.04, -0.14, 0.02, -0.08, 0.0, -0.01, -0.02, 0.06, 0.0, 0.04, -0.03,
-            0.09, 0.12, 0.09, 0.14, 0.10, 0.03, 0.02, -0.06, 0.03, 0.13, 0.19, 0.07, 0.10, -0.03,
-            -0.09, -0.12, -0.03, 0.08, 0.10, 0.13, 0.03, -0.07, -0.015, -0.14, -0.18, -0.07, -0.01,
-            0.04, -0.09, -0.15, -0.027, -0.23, -0.09, -0.23, -0.05, -0.09, -0.16, -0.05, -0.017,
+            -0.14, -0.21, -0.11, -0.08, -0.07, -0.09, -0.17, -0.24,
+            -0.08, -0.04, 0.07, -0.12, -0.03, -0.13, -0.04, -0.14,
+            0.02, -0.08, 0.0, -0.01, -0.02, 0.06, 0.0, 0.04,
+            -0.03, 0.09, 0.12, 0.09, 0.14, 0.10, 0.03, 0.02,
+            -0.06, 0.03, 0.13, 0.19, 0.07, 0.10, -0.03, -0.09,
+            -0.12, -0.03, 0.08, 0.10, 0.13, 0.03, -0.07, -0.015,
+            -0.14, -0.18, -0.07, -0.01, 0.04, -0.09, -0.15, -0.027,
+            -0.23, -0.09, -0.23, -0.05, -0.09, -0.16, -0.05, -0.017,
         ],
         //Rook
         [
-            0.13, 0.10, 0.18, 0.15, 0.12, 0.12, 0.08, 0.05, 0.11, 0.13, 0.13, 0.11, -0.03, 0.03,
-            0.08, 0.03, 0.07, 0.07, 0.07, 0.05, 0.04, -0.03, -0.05, -0.03, 0.04, 0.03, 0.13, 0.01,
-            0.02, 0.01, -0.01, 0.02, 0.03, 0.05, 0.08, 0.04, -0.05, -0.06, -0.08, -0.11, -0.04,
-            0.0, -0.05, -0.01, -0.07, -0.12, -0.08, -0.16, -0.06, -0.06, 0.0, 0.02, -0.09, -0.09,
-            -0.11, -0.03, -0.09, 0.02, 0.03, -0.01, -0.05, -0.13, 0.04, -0.20,
+            0.13, 0.10, 0.18, 0.15, 0.12, 0.12, 0.08, 0.05,
+            0.11, 0.13, 0.13, 0.11, -0.03, 0.03, 0.08, 0.03,
+            0.07, 0.07, 0.07, 0.05, 0.04, -0.03, -0.05, -0.03,
+            0.04, 0.03, 0.13, 0.01, 0.02, 0.01, -0.01, 0.02,
+            0.03, 0.05, 0.08, 0.04, -0.05, -0.06, -0.08, -0.11,
+            -0.04, 0.0, -0.05, -0.01, -0.07, -0.12, -0.08, -0.16,
+            -0.06, -0.06, 0.0, 0.02, -0.09, -0.09, -0.11, -0.03,
+            -0.09, 0.02, 0.03, -0.01, -0.05, -0.13, 0.04, -0.20,
         ],
         //Queen
         [
-            -0.09, 0.22, 0.22, 0.27, 0.27, 0.19, 0.10, 0.20, -0.17, 0.20, 0.32, 0.41, 0.58, 0.25,
-            0.30, 0., -0.20, 0.06, 0.09, 0.49, 0.47, 0.35, 0.19, 0.09, 0.03, 0.22, 0.24, 0.45,
-            0.57, 0.40, 0.57, 0.36, -0.18, 0.28, 0.19, 0.47, 0.31, 0.34, 0.39, 0.23, -0.16, -0.27,
-            0.15, 0.06, 0.09, 0.17, 0.10, 0.05, -0.22, -0.23, -0.30, -0.16, -0.16, -0.23, -0.36,
-            -0.32, -0.33, -0.28, -0.22, -0.43, -0.05, -0.32, -0.20, -0.41,
+            -0.09, 0.22, 0.22, 0.27, 0.27, 0.19, 0.10, 0.20,
+            -0.17, 0.20, 0.32, 0.41, 0.58, 0.25, 0.30, 0.,
+            -0.20, 0.06, 0.09, 0.49, 0.47, 0.35, 0.19, 0.09,
+            0.03, 0.22, 0.24, 0.45, 0.57, 0.40, 0.57, 0.36,
+            -0.18, 0.28, 0.19, 0.47, 0.31, 0.34, 0.39, 0.23,
+            -0.16, -0.27, 0.15, 0.06, 0.09, 0.17, 0.10, 0.05,
+            -0.22, -0.23, -0.30, -0.16, -0.16, -0.23, -0.36, -0.32,
+            -0.33, -0.28, -0.22, -0.43, -0.05, -0.32, -0.20, -0.41,
         ],
         //King
         [
-            -0.74, -0.35, -0.18, -0.18, -0.11, 0.15, 0.04, -0.17, -0.12, 0.17, 0.14, 0.17, 0.17,
-            0.38, 0.23, 0.11, 0.10, 0.17, 0.23, 0.15, 0.20, 0.45, 0.44, 0.13, -0.08, 0.22, 0.24,
-            0.27, 0.26, 0.33, 0.26, 0.03, -0.18, -0.04, 0.21, 0.24, 0.27, 0.23, 0.09, -0.11, -0.19,
-            -0.03, 0.11, 0.21, 0.23, 0.16, 0.07, -0.09, -0.27, -0.11, 0.04, 0.13, 0.14, 0.04,
-            -0.05, -0.17, -0.53, -0.34, -0.21, -0.11, -0.28, -0.14, -0.24, -0.43,
+            -0.74, -0.35, -0.18, -0.18, -0.11, 0.15, 0.04, -0.17,
+            -0.12, 0.17, 0.14, 0.17, 0.17, 0.38, 0.23, 0.11,
+            0.10, 0.17, 0.23, 0.15, 0.20, 0.45, 0.44, 0.13,
+            -0.08, 0.22, 0.24, 0.27, 0.26, 0.33, 0.26, 0.03,
+            -0.18, -0.04, 0.21, 0.24, 0.27, 0.23, 0.09, -0.11,
+            -0.19, -0.03, 0.11, 0.21, 0.23, 0.16, 0.07, -0.09,
+            -0.27, -0.11, 0.04, 0.13, 0.14, 0.04, -0.05, -0.17,
+            -0.53, -0.34, -0.21, -0.11, -0.28, -0.14, -0.24, -0.43,
         ],
     ];
 }
-
diff --git a/src/main.rs b/src/main.rs
@@ -1,7 +1,7 @@
 use std::time::Duration;
 
 use crate::algorithms::the_algorithm::Algorithm;
-#[allow(dead_code, unused_imports)]
+#[allow(unused_imports)]
 use crate::common::constants::modules::{
     ALPHA_BETA, ANALYZE, NAIVE_PSQT, PAWN_STRUCTURE, SEARCH_EXTENSIONS, SKIP_BAD_MOVES,
     SQUARE_CONTROL_METRIC, TAPERED_EVERY_PESTO_PSQT, TAPERED_INCREMENTAL_PESTO_PSQT,
@@ -17,8 +17,8 @@ mod pitter;
 #[tokio::main]
 async fn main() {
     //ALPHA_BETA | ANALYZE | SEARCH_EXTENSIONS | SKIP_BAD_MOVES | SQUARE_CONTROL_METRIC | TRANSPOSITION_TABLE | NAIVE_PSQT | PAWN_STRUCTURE | TAPERED_EVERY_PRESTO_PSQT | TAPERED_INCREMENTAL_PESTO_PSQT
-    let modules1 = ALPHA_BETA | TAPERED_INCREMENTAL_PESTO_PSQT;
-    let modules2 = ALPHA_BETA;
+    let modules1 = ALPHA_BETA | TAPERED_EVERY_PESTO_PSQT;
+    let modules2 = ALPHA_BETA | NAIVE_PSQT;
     let time_per_move1 = Duration::from_micros(2000);
     let time_per_move2 = Duration::from_micros(2000);
 
@@ -30,6 +30,6 @@ async fn main() {
     // competition.analyze_algorithm_choices(|(game_info, _), _| {
     //     game_info.outcome == GameOutcome::InconclusiveTooLong
     // });
-    let results = competition.start_competition(200).await;
+    let results = competition.start_competition(50).await;
     dbg!(results);
 }
