Tweak material imbalance for losing chess

giveaway STC
LLR: 2.95 (-2.94,2.94) [0.00,10.00]
Total: 6300 W: 2508 L: 2339 D: 1453
http://www.variantfishtest.org:6543/tests/view/5fe7aa166e23db221d9e96b8

giveaway LTC
LLR: 2.95 (-2.94,2.94) [0.00,10.00]
Total: 4503 W: 1694 L: 1554 D: 1255
http://www.variantfishtest.org:6543/tests/view/5fe7c1b06e23db221d9e96c3

losers STC
LLR: 2.96 (-2.94,2.94) [-10.00,5.00]
Total: 1284 W: 590 L: 538 D: 156
http://www.variantfishtest.org:6543/tests/view/5fe7c4ad6e23db221d9e96c7

losers LTC
LLR: 2.98 (-2.94,2.94) [-10.00,5.00]
Total: 1536 W: 691 L: 641 D: 204
http://www.variantfishtest.org:6543/tests/view/5fe854d46e23db221d9e96c9

diff --git a/src/material.cpp b/src/material.cpp
index 539791c..2019929 100644 (file)
--- a/src/material.cpp
+++ b/src/material.cpp
@@ -116,7 +116,11 @@ namespace {
     }
 
     if (pos.must_capture())
-        bonus += 3 * QuadraticOurs[KNIGHT][PAWN] * pieceCount[Us][KNIGHT] * pieceCount[Us][PAWN];
+        bonus +=  (make_score(mg_value(QuadraticOurs[PAWN][PAWN]), 0) * pieceCount[Us][PAWN]
+                   + 3 * QuadraticOurs[KNIGHT][PAWN] * pieceCount[Us][KNIGHT]
+                   + QuadraticOurs[QUEEN][PAWN] * pieceCount[Us][QUEEN]) * pieceCount[Us][PAWN]
+                + make_score( mg_value(QuadraticOurs[KNIGHT][KNIGHT]),
+                             -eg_value(QuadraticOurs[KNIGHT][KNIGHT])) * pieceCount[Us][KNIGHT] * pieceCount[Us][KNIGHT];
     else if (pos.check_counting())
         bonus -= 2 * QuadraticOurs[PAWN][PAWN] * pieceCount[Us][PAWN] * pieceCount[Us][PAWN];