Exclude paths via CTF squares

kingofthehill STC
LLR: 2.96 (-2.94,2.94) [0.00,10.00]
Total: 1236 W: 580 L: 473 D: 183
http://www.variantfishtest.org:6543/tests/view/5e9c51f56e23db36d55f29e1

kingofthehill LTC
LLR: 2.97 (-2.94,2.94) [0.00,10.00]
Total: 3585 W: 1551 L: 1413 D: 621
http://www.variantfishtest.org:6543/tests/view/5e9c600f6e23db36d55f29e8

racingkings STC
LLR: -2.97 (-2.94,2.94) [0.00,10.00]
Total: 3192 W: 1005 L: 1041 D: 1146
http://www.variantfishtest.org:6543/tests/view/5e9c52076e23db36d55f29e4

racingkings LTC
LLR: 2.95 (-2.94,2.94) [-10.00,5.00]
Total: 5250 W: 1430 L: 1413 D: 2407
http://www.variantfishtest.org:6543/tests/view/5e9c60076e23db36d55f29e6

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index 11870c5..abcf22e 100644 (file)
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -918,7 +918,7 @@ namespace {
             int wins = popcount(ctfTargets & ctfPieces);
             if (wins)
                 score += make_score(4000, 4000) * wins / (wins + dist * dist);
-            Bitboard current = ctfPieces;
+            Bitboard current = ctfPieces & ~ctfTargets;
             processed |= ctfPieces;
             ctfPieces = onHold & ~processed;
             onHold = onHold2 & ~processed;