Basis implementation of using main and capture history for scoring the different possible moves (no functional changes but slower). Bench: 4881443

locutus2 · locutus2 · commit 82958c97214b · 2020-04-20T11:36:33.000+02:00
diff --git a/src/evaluate.cpp b/src/evaluate.cpp
@@ -257,9 +257,11 @@ namespace {
     constexpr Bitboard OutpostRanks = (Us == WHITE ? Rank4BB | Rank5BB | Rank6BB
                                                    : Rank5BB | Rank4BB | Rank3BB);
     const Square* pl = pos.squares<Pt>(Us);
+	constexpr Piece movedPiece = make_piece(Us, Pt);
 
     Bitboard b, bb;
     Score score = SCORE_ZERO;
+    Thread *thisThread = pos.this_thread();
 
     attackedBy[Us][Pt] = 0;
 
@@ -284,10 +286,26 @@ namespace {
             kingAttacksCount[Us] += popcount(b & attackedBy[Them][KING]);
         }
 
-        int mob = popcount(b & mobilityArea[Us]);
+        bb = b & mobilityArea[Us];
+        int mob = popcount(bb);
 
         mobility[Us] += MobilityBonus[Pt - 2][mob];
 
+        volatile int hist = -std::max(thisThread->mainHistory.divisor, thisThread->captureHistory.divisor);
+        while (bb)
+        {
+            Square to = pop_lsb(&bb);
+            Piece captured = pos.piece_on(to);
+			volatile int h;
+
+            if (captured)
+                h = thisThread->captureHistory[movedPiece][to][type_of(captured)];
+            else
+                h = thisThread->mainHistory[movedPiece][to];
+			hist = std::max(h, hist);
+        }
+		score += make_score(hist / 100000, hist / 100000);
+
         if (Pt == BISHOP || Pt == KNIGHT)
         {
             // Bonus if piece is on an outpost square or can reach one
diff --git a/src/movepick.h b/src/movepick.h
@@ -64,6 +64,8 @@ struct Stats : public std::array<Stats<T, D, Sizes...>, Size>
 {
   typedef Stats<T, D, Size, Sizes...> stats;
 
+  static constexpr int divisor = D;
+
   void fill(const T& v) {
 
     // For standard-layout 'this' points to first struct member

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,8 @@ struct Stats : public std::array<Stats<T, D, Sizes...>, Size>`
`64`	`64`	`{`
`65`	`65`	`typedef Stats<T, D, Size, Sizes...> stats;`
`66`	`66`
	`67`	`+ static constexpr int divisor = D;`
	`68`	`+`
`67`	`69`	`void fill(const T& v) {`
`68`	`70`
`69`	`71`	`// For standard-layout 'this' points to first struct member`